货代bug修改 2023-11-23

src/components/iosbasic-data/TreeSelect.vue

@@ -2,7 +2,7 @@
     <el-select
         ref="select"
         :value="value"
-        placeholder="请选择"
+        :placeholder="placeholder"
         :size="size"
         clearable
         :disabled="disabled"
@@ -87,7 +87,11 @@ export default {
                     children: 'children'
                 }
             }
-        }
+        },
+        placeholder:{
+            type: String,
+            default: '请选择'
+        },
     },
     data() {
         return {

src/components/iosbasic-data/searchquery.vue

@@ -3,7 +3,7 @@
         <div style="display:flex">
             <!--<slot v-if="slot" name="slot"></slot>-->
             <div style="width: 100%;">
-                <el-select style="width: 100%" v-model="selectValue" size="small" placeholder="请选择"
+                <el-select style="width: 100%" v-model="selectValue" size="small" :placeholder="placeholder"
                            :filterable="filterable" :clearable="clearable"
                            :remote="remote" :remote-method="remoteMethod"
                            :multiple="multiple" :collapse-tags="collapseTags"
@@ -125,6 +125,11 @@
                 type:Number,
                 default: 1
             },
+            // 未输入的文字提示
+            placeholder:{
+                type:String,
+                default:'请选择'
+            },
         },
         methods:{
             // 聚焦事件

src/views/iosBasicData/CollectionSettlement/finstlbillsDetails.vue

@@ -548,27 +548,30 @@
                 this.form.businessType = 'STL' // 结算单
                 this.form.dc = 'D' // 收
 
-                this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                    item.lineNo = index
-                    item.pType = item.businessType
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.billDate
-                    item.dc = item.accountDc // 收付
-                    if (item.currentStlCurCode == 'CNY') {
-                        item.currentStlAmount = item.currentStlAmountRMB
-                    }else {
-                        item.currentStlAmount = item.currentStlAmountUSD
-                    }
-                    delete item.businessType
-                    if (!this.form.id) {
-                        delete item.id
-                    }
-                    delete item.billNo
-                    delete item.billDate
-                    delete item.accountDc
-                    return item
-                })
+                if (!this.form.id) {
+                    this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
+                        item.lineNo = index
+                        item.pType = item.businessType
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.billDate
+                        item.dc = item.accountDc // 收付
+                        if (item.currentStlCurCode == 'CNY') {
+                            item.currentStlAmount = item.currentStlAmountRMB
+                        }else {
+                            item.currentStlAmount = item.currentStlAmountUSD
+                        }
+                        delete item.businessType
+                        if (!this.form.id) {
+                            delete item.id
+                        }
+                        delete item.billNo
+                        delete item.billDate
+                        delete item.accountDc
+                        return item
+                    })
+                }
+
                 finstlbillsSubmit(this.form).then(res=>{
                     this.saveLoading = false
                     this.$message.success('操作成功');

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -548,27 +548,30 @@
                 this.form.businessType = 'STL' // 结算单
                 this.form.dc = 'C' // 付
 
-                this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                    item.lineNo = index
-                    item.pType = item.businessType
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.billDate
-                    item.dc = item.accountDc // 收付
-                    if (item.currentStlCurCode == 'CNY') {
-                        item.currentStlAmount = item.currentStlAmountRMB
-                    }else {
-                        item.currentStlAmount = item.currentStlAmountUSD
-                    }
-                    delete item.businessType
-                    if (!this.form.id) {
-                        delete item.id
-                    }
-                    delete item.billNo
-                    delete item.billDate
-                    delete item.accountDc
-                    return item
-                })
+                if (!this.form.id) {
+                    this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
+                        item.lineNo = index
+                        item.pType = item.businessType
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.billDate
+                        item.dc = item.accountDc // 收付
+                        if (item.currentStlCurCode == 'CNY') {
+                            item.currentStlAmount = item.currentStlAmountRMB
+                        }else {
+                            item.currentStlAmount = item.currentStlAmountUSD
+                        }
+                        delete item.businessType
+                        if (!this.form.id) {
+                            delete item.id
+                        }
+                        delete item.billNo
+                        delete item.billDate
+                        delete item.accountDc
+                        return item
+                    })
+                }
+
                 finstlbillsSubmit(this.form).then(res=>{
                     this.saveLoading = false
                     this.$message.success('操作成功');

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -73,6 +73,7 @@
                                                                           :remote="true"
                                                                           :disabled="detailData.seeDisabled || item[0].disabled"
                                                                           :buttonIf="false"
+                                                                          :placeholder="`请选择${item[0].text || ''}`"
                                                                           :forParameter="item[0].forParameter"
                                                                           @remoteMethod="remoteMethod($event,item[0].prop)"
                                                                           @corpChange="corpChange($event,item[0].prop)"
@@ -104,6 +105,7 @@
                                                                           :remote="true"
                                                                           :disabled="detailData.seeDisabled || item[1].disabled"
                                                                           :buttonIf="false"
+                                                                          :placeholder="`请选择${item[1].text || ''}`"
                                                                           :forParameter="item[1].forParameter"
                                                                           @remoteMethod="remoteMethod($event,item[1].prop)"
                                                                           @corpChange="corpChange($event,item[1].prop)"
@@ -118,13 +120,14 @@
                                                                          size="small"
                                                                          :disabled="detailData.seeDisabled || item[1].disabled"
                                                                          :multiple="false"
+                                                                         :placeholder="`请选择${item[1].text || ''}`"
                                                                          @input="corpChange($event,item[1].prop)">
                                                             </tree-select>
 
                                                             <el-input v-else type="age" style="width: 100%;" v-model="form[item[1].prop]"
                                                                       size="small" autocomplete="off"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                      clearable :placeholder="'请输入' + item[1].label" ></el-input>
+                                                                      clearable :placeholder="'请输入' + item[1].text || ''" ></el-input>
                                                         </el-form-item>
                                                     </el-col>
                                                     <el-col v-if="item[2]" :span="item[2].span?item[2].span:12">
@@ -142,6 +145,7 @@
                                                                           :disabled="detailData.seeDisabled || item[2].disabled"
                                                                           :buttonIf="false"
                                                                           :forParameter="item[1].forParameter"
+                                                                          :placeholder="`请选择${item[2].text || ''}`"
                                                                           @remoteMethod="remoteMethod($event,item[2].prop)"
                                                                           @corpChange="corpChange($event,item[2].prop)"
                                                                           @corpFocus="remoteMethod($event,item[2].prop)" >
@@ -149,7 +153,7 @@
                                                             <el-input v-else type="age" style="width: 100%;" v-model="form[item[2].prop]"
                                                                       size="small" autocomplete="off"
                                                                       :disabled="detailData.seeDisabled || item[1].disabled"
-                                                                      clearable :placeholder="'请输入' + item[2].label" ></el-input>
+                                                                      clearable :placeholder="'请输入' + item[2].text || ''" ></el-input>
                                                         </el-form-item>
                                                     </el-col>
                                                 </el-row>
@@ -169,6 +173,7 @@
                                                                   :disabled="detailData.seeDisabled || item.disabled"
                                                                   :buttonIf="item.buttonIf"
                                                                   :forParameter="item.forParameter"
+                                                                  :placeholder="`请选择${item.text || ''}`"
                                                                   @remoteMethod="remoteMethod($event,item.prop)"
                                                                   @corpChange="corpChange($event,item.prop)"
                                                                   @corpFocus="remoteMethod($event,item.prop)">
@@ -178,7 +183,7 @@
                                                     <el-input v-else type="age" style="width: 100%;" v-model="form[item.prop]"
                                                               size="small" autocomplete="off"
                                                               :disabled="detailData.seeDisabled || item.disabled"
-                                                              clearable :placeholder="'请输入' + item.label" ></el-input>
+                                                              clearable :placeholder="'请输入' + item.text || ''" ></el-input>
                                                 </el-form-item>
                                             </div>
 
@@ -325,6 +330,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                         {
                             label: "客户名称", // 调往来单位接口
                             prop: "corpCnName",
+                            text:"客户名称",
                             type:'select',
                             dicData:[],
                             disabled:false,
@@ -345,6 +351,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             {
                                 label: "客户OP", // 客户联系人姓名 电话和邮箱带出来，可以修改 往来单位接口 需要传一个客户名称的值过去
                                 prop: "corpAttnName",
+                                text:"姓名",
                                 type:'select',
                                 dicData:[],
                                 span:10,
@@ -358,6 +365,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             {
                                 label: "", //客户联系人电话
                                 prop: "corpAttnTel",
+                                text:"电话",
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
@@ -370,6 +378,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             {
                                 label: "", // 客户联系人邮箱
                                 prop: "corpAttnEmail",
+                                text:"邮箱",
                                 labelWidth:'10px',
                                 disabled:true,
                                 span:7,
@@ -384,6 +393,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             {
                                 label: "业务来源", // OWN=公司  AGENT=代理 SALES=业务员
                                 prop: "srcType",
+                                text:"业务来源",
                                 type:'select',
                                 disabled:true,
                                 dicData:[
@@ -404,6 +414,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             {
                                 label: "",
                                 prop: "srcCnName", // 来源中文 公司不是下拉写死公司两字 业务员调用户管理列表 代理调往来单位四个代理数据
+                                text:"来源",
                                 labelWidth:'10px',
                                 type:'select',
                                 disabled:true,
@@ -418,6 +429,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                         [
                             {
                                 label: "MB/L NO",
+                                text:"MB/L NO",
                                 prop: "mblno",
                                 span:19,
                                 disabled:false,
@@ -425,6 +437,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             },
                             {
                                 label: "",  // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
+                                text:"付款方式",
                                 prop: "mpaymode",
                                 type:'select',
                                 labelWidth:'10px',
@@ -452,6 +465,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             },
                             {
                                 label: "",
+                                text:"HB/L NO",
                                 prop: "hblno",
                                 labelWidth:'10px',
                                 span:12,
@@ -459,6 +473,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             },
                             {
                                 label: "", // HB/L 付款方式 PP=预付, CC=到付, FPA, Other', 申请之后默认 PP
+                                text:"付款方式",
                                 prop: "hpaymode",
                                 labelWidth:'10px',
                                 disabled:false,
@@ -478,17 +493,20 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                         ],
                         {
                             label: "booking NO", // 订舱号
+                            text:"booking NO",
                             prop: "bookingNo",
                             disabled:false,
                         },
                         {
                             label: "外提单号", // Co-Loader 中文名称  往来单位 类别
+                            text:"外提单号",
                             prop: "refno",
                             disabled:false,
                         },
                         [
                             {
                                 label: "业务编号",
+                                text:"业务编号",
                                 prop: "billNo",
                                 disabled:true,
                             },
@@ -507,6 +525,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                         [
                             {
                                 label: "OP",  // 操作id 用户管理下拉 模糊搜索
+                                text:"OP",
                                 prop: "operatorName",
                                 type:'select',
                                 dicData:[],
@@ -524,6 +543,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
                             },
                             {
                                 label: "核算部门", // 核算部门Id accDept 核算部门 accDeptName 调机构管理接口
+                                text:"核算部门",
                                 prop: "accDeptName",
                                 type:'tree',
                                 dicData:[],

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -764,27 +764,29 @@
                 this.form.businessType = 'CHK' // 对账单
                 this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
 
-                this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
-                    item.lineNo = index
-                    item.pType = item.businessType
-                    item.accBillId = item.id
-                    item.accBillNo = item.billNo
-                    item.accDate = item.billDate
-                    item.dc = item.accountDc // 收付
-                    if (item.currentStlCurCode == 'CNY') {
-                        item.currentStlAmount = item.currentStlAmountRMB
-                    }else {
-                        item.currentStlAmount = item.currentStlAmountUSD
-                    }
-                    delete item.businessType
-                    if (!this.form.id) {
-                        delete item.id
-                    }
-                    delete item.billNo
-                    delete item.billDate
-                    delete item.accountDc
-                    return item
-                })
+                if (!this.form.id) {
+                    this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
+                        item.lineNo = index
+                        item.pType = item.businessType
+                        item.accBillId = item.id
+                        item.accBillNo = item.billNo
+                        item.accDate = item.billDate
+                        item.dc = item.accountDc // 收付
+                        if (item.currentStlCurCode == 'CNY') {
+                            item.currentStlAmount = item.currentStlAmountRMB
+                        }else {
+                            item.currentStlAmount = item.currentStlAmountUSD
+                        }
+                        delete item.businessType
+                        if (!this.form.id) {
+                            delete item.id
+                        }
+                        delete item.billNo
+                        delete item.billDate
+                        delete item.accountDc
+                        return item
+                    })
+                }
                 finstlbillsSubmit(this.form).then(res=>{
                     this.saveLoading = false
                     this.pageLoading = false