Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1868,7 +1868,7 @@ export default {
             this.reportformsObj = data
         },
         // 生成应收应付
-        copyfun(dc) {
+        async copyfun(dc) {
             let selection = []
             if (dc == 'D') {
                 selection = this.selectionDList
@@ -1883,8 +1883,24 @@ export default {
                     return
                 }
             }
+            let shortName = "";
+            if(dc==="C"){
+                let res = await getBcorpsDetail(this.assemblyForm.corpId)
+                if(res && res.data && res.data.data){
+                    shortName = res.data.data.shortName
+                }
+            }
             let arr = selection.map(item => {
                 let obj = {}
+                if(dc==="C"){
+                    // 结算单位拿主表客户名称
+                    obj.corpId = this.assemblyForm.corpId
+                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpEnName = this.assemblyForm.corpEnName
+                    obj.shortName = shortName
+                    obj.dc = "D"
+                }
+
                 obj.feeId = item.feeId
                 obj.feeCnName = item.feeCnName
                 obj.feeEnName = item.feeEnName
@@ -2434,6 +2450,7 @@ export default {
         },
         // 客户的回调
         async corpChange(value, name, row, dc) {
+            console.log("corpChange", "value", value, "name", name, "row", row, "dc", dc)
             if (name == 'shortName') {
                 console.log(value, name)
                 if (!value) {
@@ -2872,6 +2889,7 @@ export default {
             let boxarr40 = ['40HC', '40GP']
             let boxarr20 = ['20GP']
             let teunum = 0
+            console.log("getBunitsPagefun", res.data.data, "feeRow", feeRow)
             for (let item of res.data.data) {
                 // 按箱型
                 if (item.quantityRule != 1) {
@@ -2899,6 +2917,7 @@ export default {
                 }
             })
             this.unitNoData = [...arr, ...this.unitNoData]
+            console.log("getBunitsPagefun.unitNoData", this.unitNoData)
             // 选择费用时带出第一条
             if (type) {
                 let feeunitNodata = []

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -8,13 +8,13 @@
             </div>
             <div class="add-customer-btn">
                 <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" type="primary" size="small"
-                    v-if="editButton&&form.status == 0" @click="inEdit">编 辑
+                    v-if="editButton && form.status == 0" @click="inEdit">编 辑
                 </el-button>
                 <el-button class="el-button--small-yh" v-if="!editButton" style="margin-left: 6px;" type="primary"
                     size="small" :disabled="isSaveBtn" @click="editCustomer(0)">保 存
                 </el-button>
-                <el-button class="el-button--small-yh" style="margin-left: 6px;"
-                    type="success" size="small" @click="editCustomer(1)" :disabled="form.status == 1">提 交
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
+                    @click="editCustomer(1)" :disabled="form.status == 1">提 交
                 </el-button>
                 <!-- <el-dropdown v-if="form.status == 1">
                     <el-button style="margin-left: 6px;" type="success" size="small">
@@ -145,8 +145,8 @@
                             <template slot="costNameForm" slot-scope="{ row }">
                                 <dic-select v-if="row.$cellEdit" v-model="row.costName" placeholder="费用名称" key="id"
                                     res="records" label="cname"
-                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5" :filterable="true"
-                                    :remote="true" dataName="cname"
+                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5"
+                                    :filterable="true" :remote="true" dataName="cname"
                                     @selectChange="rowDicChange('costName', $event, row)"></dic-select>
                                 <span v-else>{{ row.costName }}</span>
                             </template>
@@ -441,9 +441,12 @@ export default {
                     dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
                 }, {
                     label: '电话',
-                    disabled: false,
-
                     prop: "phone",
+                    disabled: false,
+                    type: 'number',
+                    controls: false,
+                    precision: 0,
+                    max: 99999999999,
                 }, {
                     label: "制单人",
                     prop: "createUserName",
@@ -1176,11 +1179,17 @@ export default {
             }
 
         },
+        isMobile(s) {
+            return /^1[0-9]{10}$/.test(s)
+        },
         //修改提交触发
         editCustomer(type) {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
+                    if (!this.isMobile(this.form.phone)) {
+                        return this.$message.error("请正确输入电话");
+                    }
                     for (let row of this.form.planItemsList.filter(item => item.isDeleted != 1)) {
                         if (!row.regionName || !row.goodsNum) {
                             this.$refs.formContacts.rowCell(row, row.$index)

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -13,8 +13,8 @@
                 <el-button class="el-button--small-yh" v-if="!editButton" style="margin-left: 6px;" type="primary"
                     size="small" :disabled="isSaveBtn" @click="editCustomer(0)">保 存
                 </el-button>
-                <el-button class="el-button--small-yh"  style="margin-left: 6px;"
-                    type="success" size="small" @click="editCustomer(1)" :disabled="form.status == 1">提 交
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
+                    @click="editCustomer(1)" :disabled="form.status == 1">提 交
                 </el-button>
                 <!-- <el-dropdown v-if="form.status == 1">
                     <el-button style="margin-left: 6px;" type="success" size="small">
@@ -137,8 +137,8 @@
                             <template slot="costNameForm" slot-scope="{ row }">
                                 <dic-select v-if="row.$cellEdit" v-model="row.costName" placeholder="费用名称" key="id"
                                     res="records" label="cname"
-                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5" :filterable="true"
-                                    :remote="true" dataName="cname"
+                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5"
+                                    :filterable="true" :remote="true" dataName="cname"
                                     @selectChange="rowDicChange('costName', $event, row)"></dic-select>
                                 <span v-else>{{ row.costName }}</span>
                             </template>
@@ -183,8 +183,8 @@
                             <template slot="costNameForm" slot-scope="{ row }">
                                 <dic-select v-if="row.$cellEdit" v-model="row.costName" placeholder="费用名称" key="id"
                                     res="records" label="cname"
-                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5" :filterable="true"
-                                    :remote="true" dataName="cname"
+                                    url="/blade-sales-part/tire/center/warehouse/costDesc/list?current=1&size=5"
+                                    :filterable="true" :remote="true" dataName="cname"
                                     @selectChange="rowDicChange('costName', $event, row)"></dic-select>
                                 <span v-else>{{ row.costName }}</span>
                             </template>
@@ -209,7 +209,7 @@
                                     :size="size" :disabled="editButton || form.status == 1" :type="type"
                                     @click="rowDel(row, index, 'centerShipPaymentCostList')">{{ row.isDeleted == 1 ?
                                         '恢复' :
-                                    '删除' }}
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -535,9 +535,12 @@ export default {
                     dicUrl: '/api/blade-sales-part/corpsAddr/corpIdByAddr?pid={{key}}'
                 }, {
                     label: '电话',
-                    disabled: false,
-
                     prop: "phone",
+                    disabled: false,
+                    type: 'number',
+                    controls: false,
+                    precision: 0,
+                    max: 99999999999,
                 }, {
                     label: '收货地址',
                     prop: "recAddress",
@@ -1258,11 +1261,17 @@ export default {
             this.$set(this.form, 'recAddress', matchedContact.belongtoarea + matchedContact.detailedAddress)
 
         },
+        isMobile(s) {
+            return /^1[0-9]{10}$/.test(s)
+        },
         //修改提交触发
         editCustomer(type) {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
+                    if (!this.isMobile(this.form.phone)) {
+                        return this.$message.error("请正确输入电话");
+                    }
                     for (let row of this.form.planItemsList.filter(item => item.isDeleted != 1)) {
                         if (!row.goodsNum) {
                             this.$refs.formContacts.rowCell(row, row.$index)