修改禅道问题

src/api/iosBasicData/costcenter/coc.js

@@ -29,6 +29,14 @@ export const submit = (data) => {
     })
 }
 //贸易代理保存
+export const add = (data) => {
+    return request({
+        url: '/api/blade-los/routecost/add',
+        method: 'post',
+        data: data
+    })
+}
+//贸易代理保存
 export const submitItemList = (data) => {
     return request({
         url: '/api/blade-los/routecost/submitItemList',

src/api/iosBasicData/costcenter/soc.js

@@ -29,6 +29,14 @@ export const submit = (data) => {
     })
 }
 //贸易代理保存
+export const add = (data) => {
+    return request({
+        url: '/api/blade-los/routecost/add',
+        method: 'post',
+        data: data
+    })
+}
+//贸易代理保存
 export const submitItemList = (data) => {
     return request({
         url: '/api/blade-los/routecost/submitItemList',

src/util/contrastData.js

@@ -2,7 +2,7 @@
 export function contrastObj(newval, oldval) {
   let reg = /^[A-Za-z]+$/;
   for (let key in newval) {
-    if(typeof newval[key]=='string'){
+    if (typeof newval[key] == 'string') {
       if (reg.test(key) && !(newval[key] instanceof Array) && (newval[key] != oldval[key] && (newval[key] || oldval[key]))) {
         return true
       }
@@ -70,35 +70,34 @@ export function contrastList2(newlist, oldlist) {
   }
   return false;
 }
-// //比较指定的几个字段数组的值(无序)
-// export function contrastListKey(newlist, oldlist,keyNames) {
-//   if (newlist.length != oldlist.length) {
-//     return true
-//   }
-//   let reg = /^[A-Za-z]+$/;
-//   for (var i = 0; i < newlist.length; i++) {
-//     for (var j = 0; j < oldlist.length; j++) {
-//       for (let newitem in newlist[i]) {
-//         if(keyNames.)
-//         for (let olditem in oldlist[j]) {
-//           if (newlist[i].id == oldlist[j].id) {
-//             if (!reg.test(newitem)) {
-//               delete newlist[i].newitem
-//             }
-//             if (!reg.test(oldlist[j])) {
-//               delete oldlist[j].olditem
-//             }
-//             if (newitem == olditem) {
-//               if (!(newlist[i][newitem] instanceof Array)) {
-//                 if (newlist[i][newitem] != oldlist[j][olditem]) {
-//                   return true
-//                 }
-//               }
-//             }
-//           }
-//         }
-//       }
-//     }
-//   }
-//   return false;
-// }
+//比较指定的几个字段数组的值(有序)
+export function contrastListKey(newlist, oldlist, keyNames) {
+  if (newlist.length != oldlist.length) {
+    return true
+  }
+  let reg = /^[A-Za-z]+$/;
+  for (var i = 0; i < newlist.length; i++) {
+    for (let newitem in newlist[i]) {
+      if (keyNames.includes(newitem)) {
+        for (let olditem in oldlist[i]) {
+          if (!reg.test(newitem)) {
+            delete newlist[i].newitem
+          }
+          if (!reg.test(oldlist[i])) {
+            delete oldlist[i].olditem
+          }
+          if (newitem == olditem) {
+            if (!(newlist[i][newitem] instanceof Array)) {
+              if (newlist[i][newitem] != oldlist[i][olditem]) {
+                console.log(newitem, i, newlist[i][newitem], oldlist[i][olditem])
+                return true
+              }
+            }
+          }
+        }
+      }
+
+    }
+  }
+  return false;
+}

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -42,7 +42,9 @@
       <trade-card title="基础信息">
         <avue-form :option="optionForm" v-model="form" ref="form">
           <tempalte slot="boxEastName">
+            <el-input v-if="form.boxClass == 'OW(拿)' && form.id" v-model="WINFAST" placeholder="请输入内容" size="small" disabled></el-input>
             <dic-select
+              v-else
               v-model="form.boxEastName"
               placeholder="箱东"
               key="id"
@@ -187,7 +189,7 @@
           <tempalte slot="boxClass">
             <dic-select
               v-model="form.boxClass"
-              placeholder="舱位类型"
+              placeholder="放箱号类型"
               key="id"
               label="dictValue"
               url="/blade-system/dict-biz/dictionary?code=boxCategory"
@@ -197,21 +199,11 @@
           <tempalte slot="cabinTypeData">
             <div>
               <dic-select
-                v-show="form.cabinType == '固定' || !form.cabinType"
                 v-model="form.cabinTypeData"
                 key="id"
                 label="dictValue"
                 placeholder="数据"
                 url="/blade-system/dict-biz/dictionary?code=cabinTypeData_1"
-                :disabled="editDisabled || !form.cabinType"
-              ></dic-select>
-              <dic-select
-                v-show="form.cabinType == '非固定'"
-                v-model="form.cabinTypeData"
-                key="id"
-                label="dictValue"
-                placeholder="数据"
-                url="/blade-system/dict-biz/dictionary?code=cabinTypeData_2"
                 :disabled="editDisabled"
               ></dic-select>
             </div>
@@ -511,6 +503,7 @@ import { Header } from "element-ui";
 export default {
   data() {
     return {
+      WINFAST: "WINFAST",
       searchStatus: false,
       query: {},
       saberUserInfo: JSON.parse(localStorage.getItem("saber-userInfo")).content, // 当前登录人个人信息
@@ -965,7 +958,7 @@ export default {
             label: "箱号",
             prop: "boxCode",
             width: 140,
-            searchPlaceholder:'请输入箱号 多个箱号用空格区分',
+            searchPlaceholder: "请输入箱号 多个箱号用空格区分",
             search: true,
             cell: true,
             slot: true,
@@ -1650,7 +1643,7 @@ export default {
       detail({ id: id })
         .then(res => {
           this.form = res.data.data;
-               if (this.query.code) {
+          if (this.query.code) {
             this.searchStatus = false;
             this.searchChange(this.query);
           }

src/views/boxManagement/containerNumber/index.vue

@@ -44,7 +44,8 @@
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.sysNo }}</span>
         </template>
         <template slot="boxEastName" slot-scope="{ row }">
-          <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.boxEastName }}</span>
+          <span v-if="row.boxClass=='OW(拿)'" style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">WINFAST</span>
+          <span v-if="row.boxClass!='OW(拿)'" style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.boxEastName }}</span>
         </template>
         <template slot="containerNumber" slot-scope="{ row }">
           <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.containerNumber }}</span>

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

@@ -1,164 +1,117 @@
 <template>
   <div>
-    <el-dialog title="客户订舱" :visible.sync="dialogVisible" append-to-body width="60%" :before-close="handleClose">
+    <el-dialog title="客户订舱" :visible.sync="dialogVisible" append-to-body width="80%" :before-close="handleClose">
       <span>
         <trade-card title="基础信息">
           <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm" :disabled="true">
             <el-row>
               <el-col span="12">
                 <el-row>
-                  <el-col span="12">
-                    <el-row>
-                      <el-form-item label="发货人" prop="hshipperDetails">
-                        <el-input
-                          type="textarea"
-                          style="width: 100%;"
-                          v-model="form.detail.hshipperDetails"
-                          size="small"
-                          autocomplete="off"
-                          :disabled="true"
-                          :rows="3"
-                          clearable
-                        ></el-input>
-                        <span v-if="form.detail.hshipperDetails != oldForm.detail.hshipperDetails" style="color: #F56C6C;">
-                          <el-popover placement="bottom-start" width="400" trigger="click">
-                            <div>
-                              <el-input
-                                type="textarea"
-                                style="width: 100%;"
-                                v-model="oldForm.detail.hshipperDetails"
-                                size="small"
-                                disabled
-                                rows="10"
-                              ></el-input>
-                            </div>
-                            <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
-                              >修改前的发货人</span
-                            >
-                          </el-popover>
-                        </span>
-                      </el-form-item>
-                    </el-row>
-                    <el-row>
-                      <el-form-item label="收货人" prop="hconsigneeDetails">
-                        <el-input
-                          type="textarea"
-                          style="width: 100%;"
-                          v-model="form.detail.hconsigneeDetails"
-                          size="small"
-                          autocomplete="off"
-                          :disabled="true"
-                          :rows="3"
-                          clearable
-                        ></el-input>
-                        <span v-if="form.detail.hconsigneeDetails != oldForm.detail.hconsigneeDetails" style="color: #F56C6C;">
-                          <el-popover placement="bottom-start" width="400" trigger="click">
-                            <div>
-                              <el-input
-                                type="textarea"
-                                style="width: 100%;"
-                                v-model="oldForm.detail.hconsigneeDetails"
-                                size="small"
-                                disabled
-                                rows="10"
-                              ></el-input>
-                            </div>
-                            <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
-                              >修改前的收货人</span
-                            >
-                          </el-popover>
-                        </span>
-                      </el-form-item>
-                    </el-row>
-                    <el-row>
-                      <el-form-item label="通知人" prop="hnotifyDetails">
-                        <el-input
-                          type="textarea"
-                          style="width: 100%;"
-                          v-model="form.detail.hnotifyDetails"
-                          size="small"
-                          autocomplete="off"
-                          :disabled="true"
-                          :rows="3"
-                          clearable
-                        ></el-input>
-                        <span v-if="form.detail.hnotifyDetails != oldForm.detail.hnotifyDetails" style="color: #F56C6C;">
-                          <el-popover placement="bottom-start" width="400" trigger="click">
-                            <div>
-                              <el-input
-                                type="textarea"
-                                style="width: 100%;"
-                                v-model="oldForm.detail.hnotifyDetails"
-                                size="small"
-                                disabled
-                                rows="10"
-                              ></el-input>
-                            </div>
-                            <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
-                              >修改前的通知人</span
-                            >
-                          </el-popover>
-                        </span>
-                      </el-form-item>
-                    </el-row>
-                  </el-col>
-                  <el-col span="12">
-                    <el-row>
-                      <el-form-item label="唛头" prop="marks">
-                        <el-input
-                          type="textarea"
-                          style="width: 100%;"
-                          v-model="form.marks"
-                          size="small"
-                          autocomplete="off"
-                          :disabled="true"
-                          :rows="5"
-                          clearable
-                        ></el-input>
-                        <span v-if="form.marks != oldForm.marks" style="color: #F56C6C;">
-                          <el-popover placement="bottom-start" width="400" trigger="click">
-                            <div>
-                              <el-input type="textarea" style="width: 100%;" v-model="oldForm.marks" size="small" disabled rows="10"></el-input>
-                            </div>
-                            <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
-                              >修改前的唛头</span
-                            >
-                          </el-popover>
-                        </span>
-                      </el-form-item>
-                    </el-row>
-                    <el-row>
-                      <el-form-item label="货物" prop="commodityDescr">
-                        <el-input
-                          type="textarea"
-                          style="width: 100%;"
-                          v-model="form.commodityDescr"
-                          size="small"
-                          autocomplete="off"
-                          :disabled="true"
-                          :rows="5"
-                          clearable
-                        ></el-input>
-                        <span v-if="form.commodityDescr != oldForm.commodityDescr" style="color: #F56C6C;">
-                          <el-popover placement="bottom-start" width="400" trigger="click">
-                            <div>
-                              <el-input
-                                type="textarea"
-                                style="width: 100%;"
-                                v-model="oldForm.commodityDescr"
-                                size="small"
-                                disabled
-                                rows="10"
-                              ></el-input>
-                            </div>
-                            <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
-                              >修改前的货物</span
-                            >
-                          </el-popover>
-                        </span>
-                      </el-form-item>
-                    </el-row>
-                  </el-col>
+                  <el-form-item label="发货人" prop="hshipperDetails">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.detail.hshipperDetails"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                    <span v-if="form.detail.hshipperDetails != oldForm.detail.hshipperDetails" style="color: #F56C6C;">
+                      <el-popover placement="bottom-start" width="600" trigger="click">
+                        <div>
+                          <el-input
+                            type="textarea"
+                            style="width: 100%;"
+                            v-model="oldForm.detail.hshipperDetails"
+                            size="small"
+                            disabled
+                            rows="10"
+                          ></el-input>
+                        </div>
+                        <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
+                          >修改前的发货人</span
+                        >
+                      </el-popover>
+                    </span>
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="收货人" prop="hconsigneeDetails">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.detail.hconsigneeDetails"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                    <span v-if="form.detail.hconsigneeDetails != oldForm.detail.hconsigneeDetails" style="color: #F56C6C;">
+                      <el-popover placement="bottom-start" width="600" trigger="click">
+                        <div>
+                          <el-input
+                            type="textarea"
+                            style="width: 100%;"
+                            v-model="oldForm.detail.hconsigneeDetails"
+                            size="small"
+                            disabled
+                            rows="10"
+                          ></el-input>
+                        </div>
+                        <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
+                          >修改前的收货人</span
+                        >
+                      </el-popover>
+                    </span>
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="通知人" prop="hnotifyDetails">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.detail.hnotifyDetails"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                    <span v-if="form.detail.hnotifyDetails != oldForm.detail.hnotifyDetails" style="color: #F56C6C;">
+                      <el-popover placement="bottom-start" width="600" trigger="click">
+                        <div>
+                          <el-input
+                            type="textarea"
+                            style="width: 100%;"
+                            v-model="oldForm.detail.hnotifyDetails"
+                            size="small"
+                            disabled
+                            rows="10"
+                          ></el-input>
+                        </div>
+                        <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference"
+                          >修改前的通知人</span
+                        >
+                      </el-popover>
+                    </span>
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="SI备注" prop="siRemarks">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.siRemarks"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                  </el-form-item>
                 </el-row>
               </el-col>
               <el-col span="12">
@@ -166,13 +119,11 @@
                   <el-col span="12">
                     <el-form-item label="装货港" prop="polCnName">
                       <el-input style="width: 100%;" v-model="form.polCnName" size="small" :disabled="true"></el-input>
-                      <span v-if="form.polCnName != oldForm.polCnName" style="color: #F56C6C;">修改前:{{ oldForm.polCnName }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col span="12">
                     <el-form-item label="卸货港" prop="podCnName">
                       <el-input style="width: 100%;" v-model="form.podCnName" size="small" :disabled="true"></el-input>
-                      <span v-if="form.podCnName != oldForm.podCnName" style="color: #F56C6C;">修改前:{{ oldForm.podCnName }}</span>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -190,7 +141,6 @@
                         style="width: 100%;"
                       >
                       </el-date-picker>
-                      <span v-if="form.etd != oldForm.etd" style="color: #F56C6C;">修改前:{{ oldForm.etd }}</span>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -212,7 +162,7 @@
                   <el-col span="12">
                     <el-form-item label="件数" prop="quantity">
                       <el-input style="width: 100%;" v-model="form.quantity" size="small" :disabled="true"></el-input>
-                      <span v-if="form.quantity != oldForm.quantity" style="color: #F56C6C;">修改前:{{ oldForm.packingUnit }}</span>
+                      <span v-if="form.quantity != oldForm.quantity" style="color: #F56C6C;">修改前:{{ oldForm.quantity }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col span="12">
@@ -236,26 +186,56 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row>
+                  <el-form-item label="唛头" prop="marks">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.marks"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                    <span v-if="form.marks != oldForm.marks" style="color: #F56C6C;">
+                      <el-popover placement="bottom-start" width="600" trigger="click">
+                        <div>
+                          <el-input type="textarea" style="width: 100%;" v-model="oldForm.marks" size="small" disabled rows="10"></el-input>
+                        </div>
+                        <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference">修改前的唛头</span>
+                      </el-popover>
+                    </span>
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="货物" prop="commodityDescr">
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;"
+                      v-model="form.commodityDescr"
+                      size="small"
+                      autocomplete="off"
+                      :disabled="true"
+                      :rows="5"
+                      clearable
+                    ></el-input>
+                    <span v-if="form.commodityDescr != oldForm.commodityDescr" style="color: #F56C6C;">
+                      <el-popover placement="bottom-start" width="600" trigger="click">
+                        <div>
+                          <el-input type="textarea" style="width: 100%;" v-model="oldForm.commodityDescr" size="small" disabled rows="10"></el-input>
+                        </div>
+                        <span style="font-size: 12px;color: #F56C6C; text-decoration: underline;cursor: pointer;" slot="reference">修改前的货物</span>
+                      </el-popover>
+                    </span>
+                  </el-form-item>
+                </el-row>
               </el-col>
             </el-row>
-            <el-row>
-              <el-form-item label="SI备注" prop="siRemarks">
-                <el-input
-                  type="textarea"
-                  style="width: 100%;"
-                  v-model="form.siRemarks"
-                  size="small"
-                  autocomplete="off"
-                  :disabled="true"
-                  :rows="3"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-row>
           </el-form>
         </trade-card>
         <trade-card title="配箱信息">
-          <span v-if="fixListShow" style="font-size: 12px;color: #F56C6C;" slot="reference">修改前配箱信息</span>
+          <span v-if="fixListShow" style="font-size: 12px;color: #F56C6C;">修改前配箱信息</span>
           <avue-crud
             v-if="fixListShow"
             :option="option"
@@ -268,7 +248,7 @@
             :cell-style="cellStyle"
           >
           </avue-crud>
-          <span v-if="fixListShow" style="font-size: 12px;color: #F56C6C;" slot="reference">修改后配箱信息</span>
+          <span v-if="fixListShow" style="font-size: 12px;color: #F56C6C;">修改后配箱信息</span>
           <avue-crud
             :option="option"
             :table-loading="loading"
@@ -294,7 +274,7 @@
 <script>
 import { getDetail } from "@/api/iosBasicData/businessCenter/bookingCabin.js";
 import { billLadingConfirm } from "@/api/iosBasicData/bills";
-import { contrastList } from "@/util/contrastData";
+import { contrastListKey } from "@/util/contrastData";
 export default {
   props: {
     oldForm: {
@@ -308,7 +288,7 @@ export default {
       form: {},
       dialogVisible: false,
       option: {
-        height: "200",
+        height: "110",
         calcHeight: 30,
         header: false,
         menu: false,
@@ -395,7 +375,19 @@ export default {
       getDetail(obj)
         .then(res => {
           this.form = res.data.data;
-          this.fixListShow = contrastList(this.form.containersList, this.oldForm.containersList, "id");
+          const keyNames = [
+            "cntrTypeCode",
+            "cntrNo",
+            "sealNo",
+            "quantity",
+            "grossWeight",
+            "measurement",
+            "tare",
+            "vgmWeight",
+            "remarks",
+            "podStationCname"
+          ];
+          this.fixListShow = contrastListKey(this.form.containersList, this.oldForm.containersList, keyNames);
         })
         .finally(() => {
           loading.close();
@@ -403,12 +395,6 @@ export default {
     },
     submit() {
       let text = [];
-      if (this.form.polCnName != this.oldForm.polCnName) {
-        text.push("装货港");
-      }
-      if (this.form.podCnName != this.oldForm.podCnName) {
-        text.push("卸货港");
-      }
       if (this.form.quantity != this.oldForm.quantity) {
         text.push("件数");
       }

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -62,7 +62,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="信用代码" prop="uscc">
+            <el-form-item v-if="!customerRequired" label="信用代码" prop="uscc" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+              <el-input v-model="formData.uscc" placeholder="请输入统一社会信用代码" clearable :style="{ width: '100%' }"> </el-input>
+            </el-form-item>
+            <el-form-item v-if="customerRequired" label="信用代码" prop="uscc">
               <el-input v-model="formData.uscc" placeholder="请输入统一社会信用代码" clearable :style="{ width: '100%' }"> </el-input>
             </el-form-item>
           </el-col>
@@ -85,7 +88,10 @@
 
         <el-row gutter="15">
           <el-col :span="16">
-            <el-form-item label="中文地址" prop="cnAddr">
+            <el-form-item v-if="!customerRequired" label="中文地址" prop="cnAddr" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+              <el-input v-model="formData.cnAddr" placeholder="请输入中文地址" clearable :style="{ width: '100%' }"> </el-input>
+            </el-form-item>
+            <el-form-item v-if="customerRequired" label="中文地址" prop="cnAddr">
               <el-input v-model="formData.cnAddr" placeholder="请输入中文地址" clearable :style="{ width: '100%' }"> </el-input>
             </el-form-item>
           </el-col>
@@ -1396,6 +1402,7 @@ export default {
   },
   data() {
     return {
+      customerRequired: false,
       options: [
         {
           value: "票结",
@@ -1547,25 +1554,25 @@ export default {
             trigger: "change"
           }
         ],
-        cnAddr: [
-          {
-            required: true,
-            message: " ",
-            trigger: "change"
-          }
-        ],
+        // cnAddr: [
+        //   {
+        //     required: true,
+        //     message: " ",
+        //     trigger: "change"
+        //   }
+        // ],
         // enAddr: [{
         //   required: true,
         //   message: ' ',
         //   trigger: 'change'
         // }],
-        uscc: [
-          {
-            required: true,
-            message: " ",
-            trigger: "change"
-          }
-        ],
+        // uscc: [
+        //   {
+        //     required: true,
+        //     message: " ",
+        //     trigger: "change"
+        //   }
+        // ],
         sourceType: [
           {
             required: true,
@@ -1717,6 +1724,12 @@ export default {
       let n = Number(res.data.data);
       this.psRateExternalMax = isNaN(n) ? 0.7 : n;
     });
+    isProcurement({ param: "customer.required" }).then(res => {
+      // res.data.data === '1'
+      if (res.data.data == 1) {
+        this.customerRequired = true;
+      }
+    });
   },
   mounted() {},
   methods: {

src/views/iosBasicData/bfeesdefine/index.vue

@@ -8,8 +8,11 @@
               <avue-tree :option="treeOption" :data="feesTypeData" @node-click="nodeClick">
                 <template slot="addBtn">
                   <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
-                    <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
-                      @click="corpTypeVisible = true"></i>
+                    <i
+                      class="el-icon-setting"
+                      style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
+                      @click="corpTypeVisible = true"
+                    ></i>
                   </el-tooltip>
                 </template>
               </avue-tree>
@@ -19,55 +22,108 @@
       </el-col>
       <el-col :span="20">
         <basic-container>
-          <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-            id="out-table" :header-cell-class-name="headerClassName" :before-open="beforeOpen" :search.sync="search"
-            v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
-            @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
-            @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+          <avue-crud
+            :option="option"
+            :table-loading="loading"
+            :data="data"
+            :page.sync="page"
+            :permission="permissionList"
+            id="out-table"
+            :header-cell-class-name="headerClassName"
+            :before-open="beforeOpen"
+            :search.sync="search"
+            v-model="form"
+            ref="crud"
+            @row-update="rowUpdate"
+            @row-save="rowSave"
+            @row-del="rowDel"
+            @search-change="searchChange"
+            @search-reset="searchReset"
+            @selection-change="selectionChange"
+            @current-change="currentChange"
+            @size-change="sizeChange"
+            @refresh-change="refreshChange"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 302)"
-            @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 302)" @on-load="onLoad">
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 302)"
+            @on-load="onLoad"
+          >
             <template slot="menuLeft">
-              <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
+              <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除 </el-button>
+              <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入 </el-button>
+              <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
+            </template>
+            <template slot-scope="scope" slot="menu">
+              <el-button
+                v-if="scope.row.status == 1"
+                type="text"
+                icon="el-icon-turn-off"
+                style="color: #85e967"
+                size="small"
+                @click.stop="statusfun(scope.row.id, 0)"
+              >
+                启用
               </el-button>
-              <el-button type="warning" size="small" icon="el-icon-printer" @click="excelBox = true">导入
+              <el-button
+                v-if="scope.row.status == 0"
+                type="text"
+                icon="el-icon-turn-off"
+                style="color: #e83c3a"
+                size="small"
+                @click.stop="statusfun(scope.row.id, 1)"
+              >
+                停用
               </el-button>
-              <el-button type="success" size="small" @click="handleExport" icon="el-icon-printer">导出</el-button>
             </template>
-              <template slot-scope="scope" slot="menu">
-                  <el-button v-if="scope.row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
-                             @click.stop="statusfun(scope.row.id,0)">
-                      启用
-                  </el-button>
-                  <el-button v-if="scope.row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
-                             @click.stop="statusfun(scope.row.id,1)">
-                      停用
-                  </el-button>
-              </template>
+            <template slot="codeForm">
+              <!-- {{ feeInformationCode }}111 -->
+              <el-input v-model="form.code" placeholder="请输入 编码" size="small" :disabled="form.id && form.code&&feeInformationCode.includes(form.code)"></el-input>
+            </template>
             <template slot="unitNoForm">
-              <search-query ref="SearchQuery"
-                            :disabled="searchDisabled"
-                            :selectValue="form.unitNo"
-                            :datalist="unitNoData"
-                            title="计量单位"
-                            :filterable="true"
-                            :clearable="true"
-                            :buttonIf="false"
-                            :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                            @corpChange="unitNoCorpChange">
+              <search-query
+                ref="SearchQuery"
+                :disabled="searchDisabled"
+                :selectValue="form.unitNo"
+                :datalist="unitNoData"
+                title="计量单位"
+                :filterable="true"
+                :clearable="true"
+                :buttonIf="false"
+                :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                @corpChange="unitNoCorpChange"
+              >
               </search-query>
             </template>
             <template slot="curNoForm">
-              <search-query ref="SearchQuery" :disabled="searchDisabled" :selectValue="form.curNo" :datalist="curNoData" title="币别" :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'code', value: 'code' }"
-                @remoteMethod="getRateListfun" @corpChange="curNoCorpChange">
+              <search-query
+                ref="SearchQuery"
+                :disabled="searchDisabled"
+                :selectValue="form.curNo"
+                :datalist="curNoData"
+                title="币别"
+                :filterable="true"
+                :clearable="true"
+                :remote="true"
+                :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                @remoteMethod="getRateListfun"
+                @corpChange="curNoCorpChange"
+              >
                 <rateManagement></rateManagement>
               </search-query>
             </template>
             <template slot="feesTypeNameForm">
-              <search-query ref="SearchQuery" :disabled="searchDisabled" :selectValue="form.feesTypeName" :datalist="feesTypeData" title="费用类别"
-                            :filterable="true" :clearable="true"
-                :remote="true" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
-                @remoteMethod="bfeesdefineListfun" @corpChange="feesTypeCorpChange">
+              <search-query
+                ref="SearchQuery"
+                :disabled="searchDisabled"
+                :selectValue="form.feesTypeName"
+                :datalist="feesTypeData"
+                title="费用类别"
+                :filterable="true"
+                :clearable="true"
+                :remote="true"
+                :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                @remoteMethod="bfeesdefineListfun"
+                @corpChange="feesTypeCorpChange"
+              >
                 <bfeesdetype></bfeesdetype>
               </search-query>
             </template>
@@ -87,21 +143,16 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="导入费用信息" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
-      v-dialog-drag>
-      <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
-        :upload-after="onSuccess">
+    <el-dialog title="导入费用信息" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false" v-dialog-drag>
+      <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore" :upload-after="onSuccess">
         <template slot="excelTemplate">
-          <el-button type="primary" @click="handleGet">
-            点击下载<i class="el-icon-download el-icon--right"></i>
-          </el-button>
+          <el-button type="primary" @click="handleGet"> 点击下载<i class="el-icon-download el-icon--right"></i> </el-button>
         </template>
       </avue-form>
       <p style="text-align: center;color: #DC0505">
         温馨提示 第一次导入时请先下载模板
       </p>
     </el-dialog>
-
   </div>
 </template>
 
@@ -114,21 +165,21 @@ import { getRateList } from "@/api/iosBasicData/rateManagement";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import bunits from "@/views/iosBasicData/bunits/index.vue";
 import bfeesdetype from "@/views/iosBasicData/bfeesdefine/bfeesdetype.vue";
-import rateManagement from '@/views/iosBasicData/rateManagement/index.vue'
+import rateManagement from "@/views/iosBasicData/rateManagement/index.vue";
 import baccelements from "@/views/iosBasicData/baccelements/index.vue";
-
+import { isProcurement } from "@/api/basicData/configuration";
 import { getToken } from "@/util/auth";
-import {getBaccelementsList} from "@/api/iosBasicData/baccelements";
-import {getWorkDicts} from "@/api/system/dictbiz";
-
+import { getBaccelementsList } from "@/api/iosBasicData/baccelements";
+import { getWorkDicts } from "@/api/system/dictbiz";
 
 export default {
   name: "费用信息(F)",
   components: { bunits, bfeesdetype, rateManagement, SearchQuery, baccelements },
   data() {
     return {
-        // 是否禁用
-        searchDisabled:false,
+      feeInformationCode:[],
+      // 是否禁用
+      searchDisabled: false,
       // 类别弹窗的开启
       corpTypeVisible: false,
       // 费用类别数据
@@ -195,17 +246,17 @@ export default {
       },
       selectionList: [],
       option: {
-        dialogDrag: true,
+        dialogDrag: true
       },
       optionBack: {
         dialogDrag: true,
-        addBtnText: '新建费用信息',
-        addTitle: '新建费用信息',
-        editBtnText: '编辑',
-        editTitle: '编辑费用信息',
-        viewBtnText: '查看',
-        viewTitle: '查看费用信息',
-        height: 'auto',
+        addBtnText: "新建费用信息",
+        addTitle: "新建费用信息",
+        editBtnText: "编辑",
+        editTitle: "编辑费用信息",
+        viewBtnText: "查看",
+        viewTitle: "查看费用信息",
+        height: "auto",
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -215,7 +266,7 @@ export default {
         viewBtn: false,
         selection: true,
         dialogClickModal: false,
-          menuWidth:220,
+        menuWidth: 220,
         column: [
           // {
           //     label: "凭证",
@@ -232,42 +283,48 @@ export default {
             prop: "code",
             width: "180",
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入费用编码",
-              trigger: "blur"
-            }],
-              overHidden:true,
+            rules: [
+              {
+                required: true,
+                message: "请输入费用编码",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "中文名称",
             prop: "cnName",
             width: "180",
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入中文名称",
-              trigger: "blur"
-            }],
-              overHidden:true,
+            rules: [
+              {
+                required: true,
+                message: "请输入中文名称",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "英文名称",
             prop: "enName",
             width: "180",
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入英文名称",
-              trigger: "blur"
-            }],
-              overHidden:true,
+            rules: [
+              {
+                required: true,
+                message: "请输入英文名称",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "费用类别",
             prop: "feesTypeName",
             formslot: true,
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //       required: true,
             //       message: "请选择费用类别",
@@ -278,24 +335,26 @@ export default {
             label: "计量单位",
             prop: "unitNo",
             formslot: true,
-            overHidden:true,
-            type: 'select',
+            overHidden: true,
+            type: "select",
             dicData: [],
             props: {
-                label: "dictValue",
-                value: "dictKey"
+              label: "dictValue",
+              value: "dictKey"
             },
-            rules: [{
-              required: true,
-              message: "请输入计量单位",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入计量单位",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "币别",
             prop: "curNo",
             formslot: true,
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //   required: true,
             //   message: "请输入币别",
@@ -314,7 +373,7 @@ export default {
           {
             label: "科目 Id",
             prop: "accId",
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //     required: true,
             //     message: "请输入科目 Id",
@@ -324,7 +383,7 @@ export default {
           {
             label: "科目编号",
             prop: "accNo",
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //   required: true,
             //   message: "请输入科目编号",
@@ -334,7 +393,7 @@ export default {
           {
             label: "科目全称",
             prop: "accFullName",
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //   required: true,
             //   message: "请输入科目全称",
@@ -346,35 +405,41 @@ export default {
             prop: "version",
             hide: true,
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "收付",
             prop: "dc",
-            type: 'select',
-            dicData: [{
-              label: '收',
-              value: 'D'
-            }, {
-              label: '付',
-              value: 'C'
-            }],
-              overHidden:true,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "状态",
             prop: "status",
-            type: 'select',
-              search: true,
-            dicData: [{
-              label: '启用',
-              value: 0
-            }, {
-              label: '停用',
-              value: 1
-            }],
+            type: "select",
+            search: true,
+            dicData: [
+              {
+                label: "启用",
+                value: 0
+              },
+              {
+                label: "停用",
+                value: 1
+              }
+            ],
             value: 0,
-              overHidden:true,
+            overHidden: true
             // rules: [{
             //   required: true,
             //   message: "请输入状态",
@@ -385,51 +450,51 @@ export default {
             label: "创建人",
             prop: "createUserName",
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "创建部门",
             prop: "createDeptName",
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "创建时间",
             prop: "createTime",
             width: 160,
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "修改人",
             prop: "updateUserName",
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "修改时间",
             prop: "updateTime",
             width: 160,
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "是否已删除（0 否 1是）",
             prop: "isDeleted",
             hide: true,
             display: false,
-              overHidden:true,
+            overHidden: true
           },
           {
             label: "备注",
             prop: "remarks",
             span: 24,
-            type: 'textarea',
+            type: "textarea",
             width: "180",
             slot: true,
             minRows: 3,
-              overHidden:true,
-          },
+            overHidden: true
+          }
         ]
       },
       data: []
@@ -455,57 +520,61 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(302), this.optionBack);
-    this.bfeesdefineListfun()
-    this.getBunitsListfun()
-    this.getRateListfun()
-      this.getBaccelementsListfun()
+    this.bfeesdefineListfun();
+    this.getBunitsListfun();
+    this.getRateListfun();
+    isProcurement({ param: "feeInformation.code" }).then(res => {
+      // res.data.data === '1'
+      if(res.data.data){
+        this.feeInformationCode=res.data.data.split(",")
+      }
+    });
   },
   methods: {
-      // 禁用启用按钮
-      statusfun(id,status){
-          this.$confirm("确定将选择数据更改状态?", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-          }).then(()=>{
-              bfeesDetail(id).then(res=>{
-                  let obj = res.data.data;
-                  obj.status = status
-                  bfeesSubmit(obj).then(()=>{
-                      this.onLoad(this.page);
-                      this.$message({
-                          type: "success",
-                          message: "操作成功!"
-                      });
-                  })
-              })
-          })
-      },
+    // 禁用启用按钮
+    statusfun(id, status) {
+      this.$confirm("确定将选择数据更改状态?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        bfeesDetail(id).then(res => {
+          let obj = res.data.data;
+          obj.status = status;
+          bfeesSubmit(obj).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+        });
+      });
+    },
     // 导出
     handleExport() {
-      var condition = ''
+      var condition = "";
       for (const key in this.search) {
-        var value = this.search[key]
+        var value = this.search[key];
         if (value) {
-          condition += `&${key}=${this.search[key]}`
+          condition += `&${key}=${this.search[key]}`;
         }
       }
 
-      this.$confirm('是否导出费用信息？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        window.open(
-          `/api/blade-los/bfees/exportBFees?${this.website.tokenHeader
-          }=${getToken()}${condition}`
-        );
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消' //
-        });
+      this.$confirm("是否导出费用信息？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
+        .then(() => {
+          window.open(`/api/blade-los/bfees/exportBFees?${this.website.tokenHeader}=${getToken()}${condition}`);
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消" //
+          });
+        });
     },
     uploadBefore(file, done, loading) {
       done();
@@ -521,23 +590,20 @@ export default {
     },
     // 下载模板
     handleGet() {
-      window.open(
-        `/api/blade-los/bfees/exportBFees/template?${this.website.tokenHeader
-        }=${getToken()}`
-      );
+      window.open(`/api/blade-los/bfees/exportBFees/template?${this.website.tokenHeader}=${getToken()}`);
     },
     // 获取费用类别数据
     bfeesdefineListfun() {
       bfeesdefineList(1, 10).then(res => {
-        this.feesTypeData = res.data.data.records
-      })
+        this.feesTypeData = res.data.data.records;
+      });
     },
     // 获取计算单位数据
     getBunitsListfun() {
-        getWorkDicts('number_rule').then(res=>{
-            this.unitNoData = res.data.data
-            this.findObject(this.option.column, "unitNo").dicData = res.data.data
-        })
+      getWorkDicts("number_rule").then(res => {
+        this.unitNoData = res.data.data;
+        this.findObject(this.option.column, "unitNo").dicData = res.data.data;
+      });
     },
 
     // 获取币别数据
@@ -547,25 +613,25 @@ export default {
         size: 10,
         cnName
       }).then(res => {
-        this.curNoData = res.data.data.records
-      })
+        this.curNoData = res.data.data.records;
+      });
     },
     // 费用信息选中回调
     feesTypeCorpChange(value) {
       this.feesTypeData.map(item => {
         if (item.cnName == value) {
-          this.form.feesTypeId = item.id
-          this.form.feesTypeName = item.cnName
+          this.form.feesTypeId = item.id;
+          this.form.feesTypeName = item.cnName;
         }
-      })
+      });
     },
     // 计量单位选中的回调
     unitNoCorpChange(value) {
-      this.form.unitNo = value
+      this.form.unitNo = value;
     },
     // 币别选中回调
     curNoCorpChange(value) {
-      this.form.curNo = value
+      this.form.curNo = value;
     },
     nodeClick(data) {
       this.query.feesTypeId = data.id;
@@ -573,34 +639,40 @@ export default {
       this.onLoad(this.page);
     },
     rowSave(row, done, loading) {
-      row.accElementId = Number(row.accElementId)
-      row.accId = Number(row.accId)
-      bfeesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
+      row.accElementId = Number(row.accElementId);
+      row.accId = Number(row.accId);
+      bfeesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
     },
     rowUpdate(row, index, done, loading) {
-      row.accElementId = Number(row.accElementId)
-      row.accId = Number(row.accId)
-      bfeesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
+      row.accElementId = Number(row.accElementId);
+      row.accId = Number(row.accId);
+      bfeesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
     },
     rowDel(row) {
       if (row.status === 1) {
@@ -621,8 +693,8 @@ export default {
           });
       } else {
         this.$message({
-          message: '非禁用状态无法删除',
-          type: 'warning'
+          message: "非禁用状态无法删除",
+          type: "warning"
         });
       }
     },
@@ -656,11 +728,11 @@ export default {
         });
     },
     beforeOpen(done, type) {
-        if (["edit", "add"].includes(type)) {
-            this.searchDisabled = false
-        } else {
-            this.searchDisabled = true
-        }
+      if (["edit", "add"].includes(type)) {
+        this.searchDisabled = false;
+      } else {
+        this.searchDisabled = true;
+      }
       if (["edit", "view"].includes(type)) {
         bfeesDetail(this.form.id).then(res => {
           this.form = res.data.data;
@@ -706,7 +778,7 @@ export default {
     },
     // 类别弹窗关闭
     corpTypeClose(done) {
-        done();
+      done();
       // this.$confirm('确认关闭？')
       //   .then(_ => {
       //     done();
@@ -740,17 +812,16 @@ export default {
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
 };
 </script>

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -86,7 +86,7 @@
         </el-button> -->
         <el-dropdown style="line-height: 0" v-if="importTemplate == 1">
           <el-button size="small" type="warning" style="margin-left: 8px" :disabled="isSaveBtn || editDisabled || showLock">
-            导入模板<i class="el-icon-arrow-down el-icon--right"></i>
+            导入样本<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-for="item in imporiData" :key="item.id" @click.native="importData2(item.id)">{{ item.name }} </el-dropdown-item>

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -66,7 +66,7 @@
         </el-button>
         <el-dropdown style="line-height: 0" v-if="importTemplate == 1">
           <el-button size="small" type="warning" style="margin-left: 8px" :disabled="form.status > 0 || showLock">
-            导入模板<i class="el-icon-arrow-down el-icon--right"></i>
+            导入样本<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-for="item in imporiData" :key="item.id" @click.native="importData2(item.id)">{{ item.name }} </el-dropdown-item>

src/views/iosBasicData/costcenter/coc/detailsPage.vue

@@ -562,7 +562,8 @@ import {
   revokeCheckAgent,
   copyAgent,
   batchDisable,
-  batchRevokeDisable
+  batchRevokeDisable,
+  add
 } from "@/api/iosBasicData/costcenter/coc";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
@@ -1969,7 +1970,9 @@ export default {
         }
         batchDisable({ ids: ids.join(",") }).then(res => {
           this.$message.success("操作成功");
-          this.getDetails(this.form.id);
+               add(this.form).then(res => {
+            this.getDetails(this.form.id);
+          });
         });
       }
       if (name == "批量撤销禁用") {
@@ -1982,7 +1985,9 @@ export default {
         }
         batchRevokeDisable({ ids: ids.join(",") }).then(res => {
           this.$message.success("操作成功");
-          this.getDetails(this.form.id);
+               add(this.form).then(res => {
+            this.getDetails(this.form.id);
+          });
         });
       }
       if (name == "POL一键保存") {

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -193,13 +193,13 @@
           </tempalte>
           <tempalte slot="cabinTypeData">
             <dic-select
-                v-model="form.cabinTypeData"
-                key="id"
-                label="dictValue"
-                placeholder="数据"
-                url="/blade-system/dict-biz/dictionary?code=cabinTypeData_1"
-                :disabled="editDisabled"
-              ></dic-select>
+              v-model="form.cabinTypeData"
+              key="id"
+              label="dictValue"
+              placeholder="数据"
+              url="/blade-system/dict-biz/dictionary?code=cabinTypeData_1"
+              :disabled="editDisabled"
+            ></dic-select>
           </tempalte>
           <tempalte slot="flightType">
             <dic-select
@@ -366,7 +366,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -501,7 +501,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType', $event, row)"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -648,7 +648,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType', $event, row)"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -783,7 +783,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -890,7 +890,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType2', $event, row)"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -1037,7 +1037,7 @@
                   label="cnName"
                   res="records"
                   @selectChange="rowDicChange('feeBoxType2', $event, row)"
-                 url="/blade-los/bcntrtypes/list?current=1&size=100"
+                  url="/blade-los/bcntrtypes/list?current=1&size=100"
                   :filterable="true"
                   :remote="true"
                   dataName="cnName"
@@ -1193,7 +1193,8 @@ import {
   topList,
   getBcorpsList,
   batchDisable,
-  batchRevokeDisable
+  batchRevokeDisable,
+  add
 } from "@/api/iosBasicData/costcenter/soc";
 import { getListTemplate, getListTemplatelist } from "@/api/iosBasicData/losbfeestemplate";
 import dicSelect from "@/components/dicSelect/main";
@@ -3346,7 +3347,9 @@ export default {
         }
         batchDisable({ ids: ids.join(",") }).then(res => {
           this.$message.success("操作成功");
-          this.getDetails(this.form.id);
+          add(this.form).then(res => {
+            this.getDetails(this.form.id);
+          });
         });
       }
       if (name == "批量撤销禁用") {
@@ -3359,7 +3362,9 @@ export default {
         }
         batchRevokeDisable({ ids: ids.join(",") }).then(res => {
           this.$message.success("操作成功");
-          this.getDetails(this.form.id);
+          add(this.form).then(res => {
+            this.getDetails(this.form.id);
+          });
         });
       }
       if (name == "POL一键保存") {

src/views/iosBasicData/financeProfit/index.vue

@@ -397,6 +397,11 @@ export default {
             ]
           },
           {
+            label: "开船日期",
+            prop: "statisticsDate",
+            overHidden: true,
+          },
+          {
             label: "箱属",
             prop: "boxBelongsTo",
             overHidden: true,

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -281,7 +281,7 @@
             <tempalte slot="bankAccountName">
               <dic-select
                 v-model="form.bankAccountName"
-                placeholder="所属公司"
+                placeholder="账户名称"
                 :key="form.affiliatedCompanyId"
                 res="corpsBankList"
                 label="accountName"
@@ -1372,11 +1372,22 @@ export default {
           this.form.corpId = row.id;
           this.form.corpEnName = row.enName;
           this.form.corpArgreementNo = row.enName;
+          this.form.affiliatedCompanyId=row.corpId;
+          this.form.affiliatedCompanyName=row.corpName;
+          this.form.uscc = row.uscc;
         } else {
           this.form.corpId = null;
           this.form.corpEnName = null;
           this.form.corpCnName = null;
           this.form.corpArgreementNo = null;
+          this.form.affiliatedCompanyId=null;
+          this.form.affiliatedCompanyName=null;
+          this.form.uscc = null;
+          this.form.bankId = null;
+          this.form.bankAccountName = null;
+          this.form.bankAccountBank = null;
+          this.form.bankAccountNo = null;
+          this.form.taxId = null;
         }
       }
       if (name == "billDate") {

src/views/ow/owPut/index.vue

@@ -78,7 +78,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 12,
         border: true,
         index: true,
         addBtn: false,
@@ -171,6 +171,20 @@ export default {
             overHidden: true
           },
           {
+            label: "提单号",
+            prop: "mblno",
+            width: 100,
+            search: true,
+            overHidden: true
+          },
+          {
+            label: "分单号",
+            prop: "hblno",
+            width: 100,
+            search: true,
+            overHidden: true
+          },
+          {
             label: "起运港",
             prop: "polCname",
             width: 100,

src/views/ow/owReminder/index.vue

@@ -43,8 +43,16 @@
             </el-tab-pane>
           </el-tabs>
           <el-button type="warning" size="small" @click="outExport">导 出 </el-button>
-          <el-tag type="danger" v-if="query.type==2">OW(拿)启用并且合同生效日期10天后还有未提箱的</el-tag>
-          <el-tag type="danger" v-if="query.type==3">OW(拿)启用并且合同失效日期前后3天</el-tag>
+          <el-tag type="danger" v-if="query.type == 2">OW(拿)启用并且合同生效日期{{ boxUsageReminder }}天后还有未提箱的</el-tag>
+          <el-tag type="danger" v-if="query.type == 3">OW(拿)启用并且合同失效日期前后{{postponementReminder}}天</el-tag>
+        </template>
+        <template slot="suitcaseNum" slot-scope="{ row }">
+          <span v-if="row.suitcaseNum != 0" style="color:#F56C6C;">
+            {{ row.suitcaseNum }}
+          </span>
+          <span v-if="row.suitcaseNum == 0">
+            {{ row.suitcaseNum }}
+          </span>
         </template>
       </avue-crud>
     </basic-container>
@@ -57,10 +65,13 @@ import { defaultDate2 } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
 import { getToken } from "@/util/auth";
 import { dateFormat } from "@/util/date";
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
   name: "OW提醒",
   data() {
     return {
+      boxUsageReminder: 10,
+      postponementReminder:3,
       badgeNum1: 0,
       badgeNum2: 0,
       badgeNum3: 0,
@@ -89,12 +100,12 @@ export default {
         delBtn: false,
         align: "center",
         column: [
-          {
-            label: "provider",
-            prop: "provider",
-            overHidden: true,
-            hide: false
-          },
+          // {
+          //   label: "provider",
+          //   prop: "provider",
+          //   overHidden: true,
+          //   hide: false
+          // },
           {
             label: "业务类型",
             prop: "busType",
@@ -268,13 +279,23 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(529), this.optionBack);
-    if (this.roleName.includes("箱管")) {
-      this.option.column.forEach(item => {
-        if (item.prop == "provider") {
-          item.hide = true;
-        }
-      });
-    }
+    isProcurement({ param: "box.usage.reminder" }).then(res => {
+      if (res.data.data) {
+        this.boxUsageReminder = res.data.data;
+      }
+    });
+    isProcurement({ param: "postponement.reminder" }).then(res => {
+      if (res.data.data) {
+        this.postponementReminder = res.data.data;
+      }
+    });
+    // if (this.roleName.includes("箱管")) {
+    //   this.option.column.forEach(item => {
+    //     if (item.prop == "provider") {
+    //       item.hide = true;
+    //     }
+    //   });
+    // }
     this.$nextTick(() => {
       this.$refs.crud.doLayout();
       this.$refs.crud.dicInit();

src/views/ow/owTask/index.vue

@@ -86,7 +86,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 6,
         border: true,
         index: true,
         addBtn: false,
@@ -208,6 +208,20 @@ export default {
             overHidden: true
           },
           {
+            label: "提单号",
+            prop: "mblno",
+            width: 100,
+            search: true,
+            overHidden: true
+          },
+          {
+            label: "分单号",
+            prop: "hblno",
+            width: 100,
+            search: true,
+            overHidden: true
+          },
+          {
             label: "起运港",
             prop: "polCname",
             width: 100,