Browse Source

INTTRA DOOR TO && TO DOOR 信息

wfg 1 year ago
parent
commit
81c4843459

+ 147 - 58
src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -275,7 +275,7 @@
             </el-row>
             <el-row >
                 <el-col :span="6">
-                    <el-button size="small" style="width: 100%;" type="primary" @click="inttraAdd">发送INTTRA EDI</el-button>
+                    <el-button size="small" style="width: 100%;" type="primary" @click="inttraAdd">发送 INTTRA EDI 时 DOOR TO 或 TO DOOR 联系人信息</el-button>
                 </el-col>
                 <el-col :span="6">
                     <el-form-item label="签单日期" prop="issueDate" >
@@ -384,59 +384,138 @@
             :before-close="beforeClose">
             <div>
                 <el-form :model="assemblyForm" ref="form" label-width="160px">
-                    <el-row :gutter="20">
-                        <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 客户名称`" prop="hNotify2CnName" >
-                                <!--<search-query :datalist="inttraData"-->
-                                <!--              :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]"-->
-                                <!--              :filterable="true"-->
-                                <!--              :clearable="true"-->
-                                <!--              :remote="true"-->
-                                <!--              :disabled="detailData.seeDisabled"-->
-                                <!--              :buttonIf="false"-->
-                                <!--              :forParameter="{key:'id',label:'cnName',value:'cnName'}"-->
-                                <!--              :placeholder="`请选择${inttraText} 客户名称`"-->
-                                <!--              @remoteMethod="remoteMethod($event,`inttra${inttraTitle}`)"-->
-                                <!--              @corpChange="corpChange($event,`inttra${inttraTitle}`)"-->
-                                <!--              @corpFocus="remoteMethod($event,`inttra${inttraTitle}`)" >-->
-                                <!--</search-query>-->
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpName`]"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 客户名称`"
-                                          @input="inttraTitleInput($event,'CorpName')" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 客户地址`"  >
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpAddr`]"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 客户地址`"
-                                          @input="inttraTitleInput($event,'CorpAddr')" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 联系人`" >
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpContacts`]"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 联系人`"
-                                          @input="inttraTitleInput($event,'CorpContacts')" ></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item :label="`${inttraText} 联系电话`" >
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpTel`]"
-                                          size="small" autocomplete="off"
-                                          :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${inttraText} 联系人电话`"
-                                          @input="inttraTitleInput($event,'CorpTel')" ></el-input>
-                            </el-form-item>
-                        </el-col>
+<!--                    <el-row :gutter="20">-->
+<!--                        <el-col :span="12">-->
+<!--                            <el-form-item :label="`${inttraText} 客户名称`" prop="hNotify2CnName" >-->
+<!--                                &lt;!&ndash;<search-query :datalist="inttraData"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :filterable="true"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :clearable="true"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :remote="true"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :disabled="detailData.seeDisabled"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :buttonIf="false"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :forParameter="{key:'id',label:'cnName',value:'cnName'}"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              :placeholder="`请选择${inttraText} 客户名称`"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              @remoteMethod="remoteMethod($event,`inttra${inttraTitle}`)"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              @corpChange="corpChange($event,`inttra${inttraTitle}`)"&ndash;&gt;-->
+<!--                                &lt;!&ndash;              @corpFocus="remoteMethod($event,`inttra${inttraTitle}`)" >&ndash;&gt;-->
+<!--                                &lt;!&ndash;</search-query>&ndash;&gt;-->
+<!--                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpName`]"-->
+<!--                                          size="small" autocomplete="off"-->
+<!--                                          :disabled="detailData.seeDisabled"-->
+<!--                                          clearable :placeholder="`请输入${inttraText} 客户名称`"-->
+<!--                                          @input="inttraTitleInput($event,'CorpName')" ></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                        <el-col :span="12">-->
+<!--                            <el-form-item :label="`${inttraText} 客户地址`"  >-->
+<!--                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpAddr`]"-->
+<!--                                          size="small" autocomplete="off"-->
+<!--                                          :disabled="detailData.seeDisabled"-->
+<!--                                          clearable :placeholder="`请输入${inttraText} 客户地址`"-->
+<!--                                          @input="inttraTitleInput($event,'CorpAddr')" ></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                        <el-col :span="12">-->
+<!--                            <el-form-item :label="`${inttraText} 联系人`" >-->
+<!--                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpContacts`]"-->
+<!--                                          size="small" autocomplete="off"-->
+<!--                                          :disabled="detailData.seeDisabled"-->
+<!--                                          clearable :placeholder="`请输入${inttraText} 联系人`"-->
+<!--                                          @input="inttraTitleInput($event,'CorpContacts')" ></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                        <el-col :span="12">-->
+<!--                            <el-form-item :label="`${inttraText} 联系电话`" >-->
+<!--                                <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpTel`]"-->
+<!--                                          size="small" autocomplete="off"-->
+<!--                                          :disabled="detailData.seeDisabled"-->
+<!--                                          clearable :placeholder="`请输入${inttraText} 联系人电话`"-->
+<!--                                          @input="inttraTitleInput($event,'CorpTel')" ></el-input>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
 
-                    </el-row>
+<!--                    </el-row>-->
 
+                  <el-row v-if="inttraDoorToVisible" :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item :label="`DOOR TO 客户名称`" prop="hNotify2CnName" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpName`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 DOOR TO 客户名称`"
+                                  @input="inttraTitleInput($event,'CorpName')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`DOOR TO 客户地址`"  >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpAddr`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入${inttraText} 客户地址`"
+                                  @input="inttraTitleInput($event,'CorpAddr')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`DOOR TO 联系人`" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpContacts`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 DOOR TO 联系人`"
+                                  @input="inttraTitleInput($event,'CorpContacts')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`DOOR TO 联系电话`" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraDoorToCorpTel`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 DOOR TO 联系人电话`"
+                                  @input="inttraTitleInput($event,'CorpTel')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+
+                  </el-row>
+
+                  <el-row v-if="inttraToDoorVisible" :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item :label="`TO DOOR 客户名称`" prop="hNotify2CnName" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpName`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 TO DOOR 客户名称`"
+                                  @input="inttraTitleInput($event,'CorpName')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`TO DOOR 客户地址`"  >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpAddr`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 TO DOOR 客户地址`"
+                                  @input="inttraTitleInput($event,'CorpAddr')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`TO DOOR 联系人`" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpContacts`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 TO DOOR 联系人`"
+                                  @input="inttraTitleInput($event,'CorpContacts')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="`TO DOOR 联系电话`" >
+                        <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttraToDoorCorpTel`]"
+                                  size="small" autocomplete="off"
+                                  :disabled="detailData.seeDisabled"
+                                  clearable :placeholder="`请输入 TO DOOR 联系人电话`"
+                                  @input="inttraTitleInput($event,'CorpTel')" ></el-input>
+                      </el-form-item>
+                    </el-col>
+
+                  </el-row>
                 </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
@@ -488,6 +567,8 @@
                 issueAtData:[],
                 // INTTRA EDI弹窗
                 inttraVisible:false,
+                inttraDoorToVisible:false,
+                inttraToDoorVisible:false,
                 inttraText:'', // 服务方式弹窗字段拼接
                 inttraTitle:'',
                 inttraData:[],
@@ -656,12 +737,12 @@
             },
             // INTTRA EDI弹窗 输入框监听
             inttraTitleInput(value,name){
-                if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
-                    this.$set(this.assemblyForm,`inttraDoorTo${name}`,value)
-                    this.$set(this.assemblyForm,`inttraToDoor${name}`,value)
-                }else {
-                    this.$set(this.assemblyForm,`inttra${this.inttraTitle}${name}`,value)
-                }
+                // if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
+                //     this.$set(this.assemblyForm,`inttraDoorTo${name}`,value)
+                //     this.$set(this.assemblyForm,`inttraToDoor${name}`,value)
+                // }else {
+                //     this.$set(this.assemblyForm,`inttra${this.inttraTitle}${name}`,value)
+                // }
             },
             // 发送INTTRA EDI弹窗开启
             inttraAdd(){
@@ -678,16 +759,23 @@
                     this.inttraText = 'DOOR TO'
                     // this.inttraBcorpslistByType()
                     this.inttraVisible = true
+                    this.inttraDoorToVisible = true
+                    this.inttraToDoorVisible = false
+                    //
                 }else if (this.assemblyForm.serviceTerms == 'CY to DOOR') {
                     this.inttraTitle = 'ToDoor'
                     this.inttraText = 'TO DOOR'
                     // this.inttraBcorpslistByType()
                     this.inttraVisible = true
+                    this.inttraDoorToVisible = false
+                    this.inttraToDoorVisible = true
                 }else if (this.assemblyForm.serviceTerms == 'DOOR to DOOR') {
                     this.inttraTitle = 'ToDoor'
                     this.inttraText = 'DOOR TO DOOR'
                     // this.inttraBcorpslistByType()
                     this.inttraVisible = true
+                    this.inttraDoorToVisible = true
+                    this.inttraToDoorVisible = true
                 }else {
                     this.$confirm('请选择其他的服务方式',{
                         confirmButtonText: "确定",
@@ -699,6 +787,7 @@
                         console.log('11111111')
                     })
                 }
+              console.log(this.assemblyForm.serviceTerms, this.inttraDoorToVisible, this.inttraToDoorVisible)
 
             },
             // INTTRA EDI弹窗清除

+ 1 - 14
src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -88,20 +88,10 @@
         type:Boolean,
         default:false,
       },
-        // 业务类型
       businessValue:{
         type:String,
         default:''
-      },
-      // 类别
-      classifyCode:{
-          type:String,
-          default:null
-      },
-      queryCode:{
-        type:String,
-          default:''
-      },
+      }
     },
     data() {
       return {
@@ -599,7 +589,6 @@
               billId:this.id,
               reportCode:this.form.classifyCode,
               groupCode:this.form.groupCode,
-               type:this.businessValue
           })
           // 获取的数据赋值
           var data = res.data.data.data
@@ -690,7 +679,6 @@
                   billId:this.id,
                   reportCode:row.classifyCode,
                   groupCode:row.groupCode,
-                  type:this.businessValue
               }).then(res => {
                   // var data = res.data.data.data.map((item,index)=>{
                   //     item.index = index
@@ -1123,7 +1111,6 @@
       onLoad(page, params = {}) {
         this.loading = true;
         params.businessType = this.businessValue
-        params.classifyCode = this.classifyCode
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

+ 2 - 2
vue.config.js

@@ -33,9 +33,9 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
         // target: 'http://192.168.8.106:1080',
-        // target: 'http://127.0.0.1:1080',
+        target: 'http://127.0.0.1:1080',
         // 打包地址
-        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {