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

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -283,7 +283,7 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item v-if="business != 1" label="客服" prop="customerServiceName"
-                                    label-width="50px" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                                    label-width="50px">
                                     <span slot="label">
                                         <span style="color: #1e9fff">客服</span>
                                     </span>

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

@@ -144,11 +144,11 @@
                                                                                             item[0].prop
                                                                                         )
                                                                                         " @corpFocus="
-                                                                                                remoteMethod(
-                                                                                                    $event,
-                                                                                                    item[0].prop
-                                                                                                )
-                                                                                                ">
+                                                                                            remoteMethod(
+                                                                                                $event,
+                                                                                                item[0].prop
+                                                                                            )
+                                                                                            ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[0].prop
@@ -227,8 +227,8 @@
                                                             item[1].type == 'tree'" v-model="form[item[1].prop]
                                                                 " filterable :data="item[1].dicData
                                                                     " :props="item[1]
-                                                                    .forParameter
-                                                                    " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
+                                                                        .forParameter
+                                                                        " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
                                                                         item[1]
                                                                             .disabled ||
                                                                         showLock
@@ -1808,10 +1808,12 @@ export default {
         editCustomer(status) {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    for (let item of this.columnforfun('accDeptName').dicData) {
-                        if (this.form.accDeptName == item.title) {
-                            if (item.hasChildren) {
-                                return this.$message.error('请选择末级部门')
+                    if (this.business == 1) {
+                        for (let item of this.columnforfun('accDeptName').dicData) {
+                            if (this.form.accDeptName == item.title) {
+                                if (item.hasChildren) {
+                                    return this.$message.error('请选择末级部门')
+                                }
                             }
                         }
                     }

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

@@ -441,7 +441,7 @@
                                     :disabled="!assemblyForm.id" @click="copyReceiptUrl(assemblyForm.id)">背箱小票链接
                                 </el-button>
                                 <el-form-item v-if="business != 1" label="客服" prop="customerServiceName"
-                                    label-width="50px" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                                    label-width="50px">
                                     <span slot="label">
                                         <span style="color: #1e9fff">客服</span>
                                     </span>

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

@@ -104,7 +104,7 @@
                                                                 }} {{ item[0].label }}
                                                             </span>
                                                             <span v-else style="color: #1e9fff">{{ item[0].label
-                                                                }}</span>
+                                                            }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->
@@ -2038,10 +2038,12 @@ export default {
         editCustomer(status) {
             this.$refs.form.validate((valid) => {
                 if (valid) {
-                    for (let item of this.columnforfun('accDeptName').dicData) {
-                        if (this.form.accDeptName == item.title) {
-                            if (item.hasChildren) {
-                                return this.$message.error('请选择末级部门')
+                    if (this.business == 1) {
+                        for (let item of this.columnforfun('accDeptName').dicData) {
+                            if (this.form.accDeptName == item.title) {
+                                if (item.hasChildren) {
+                                    return this.$message.error('请选择末级部门')
+                                }
                             }
                         }
                     }
@@ -2656,9 +2658,9 @@ export default {
             })
         },
         copyCreateAndAdd(id, type) {
-            console.log(id,1234556)
-            let obj={
-                id:id
+            console.log(id, 1234556)
+            let obj = {
+                id: id
             }
             const loading = this.$loading({
                 lock: true,