Browse Source

1.箱管所有业务 OW所有业务 自动生成费用明细的备注都不能编辑
2.aeamend siamend详情页新加所属公司 并修改币别汇率相关的功能
3.海运进出口 收费角色 没有生成应付,不需要这个按钮
4.海运出口,审核通过的单据,就不能提取成本了
5.分单添加主单,主单提交审核后,主单、分单费用就不能编辑更改删除
6.海运进出口 根据用户角色显示利润
7.用户管理 分公司管理员允许用户管理增删改查
8.费用模板明细去掉详情
9.费用提交审核以后,增加控制

Qukatie 9 months ago
parent
commit
520098de3f
28 changed files with 2291 additions and 2359 deletions
  1. 8 2
      src/views/boxManagement/agentBox/detailsPage.vue
  2. 8 2
      src/views/boxManagement/boxAdjustment/detailsPage.vue
  3. 15 3
      src/views/boxManagement/boxCost/detailsPage.vue
  4. 7 1
      src/views/boxManagement/boxExit/detailsPage.vue
  5. 7 1
      src/views/boxManagement/buyContainer/detailsPage.vue
  6. 7 1
      src/views/boxManagement/rentalBox/detailsPage.vue
  7. 8 8
      src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue
  8. 1 1
      src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue
  9. 12 9
      src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue
  10. 1 1
      src/views/iosBasicData/OceanFreightImport/bills/assembly/mbinformation.vue
  11. 333 364
      src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue
  12. 9 9
      src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue
  13. 1 1
      src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue
  14. 27 19
      src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue
  15. 17 18
      src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue
  16. 4 1
      src/views/iosBasicData/SeafreightExportF/bills/index.vue
  17. 9 1
      src/views/iosBasicData/feeApplication/detailsPage.vue
  18. 7 0
      src/views/iosBasicData/feeApplication/index.vue
  19. 3 2
      src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue
  20. 75 43
      src/views/iosBasicData/seamends/amendsDetails.vue
  21. 743 838
      src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue
  22. 4 4
      src/views/iosBasicData/seamends/assembly/billgenerated.vue
  23. 71 41
      src/views/iosBasicData/siamends/amendsDetails.vue
  24. 740 830
      src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue
  25. 135 143
      src/views/iosBasicData/siamends/assembly/billgenerated.vue
  26. 13 2
      src/views/ow/owPut/detailsPage.vue
  27. 22 10
      src/views/ow/owTask/detailsPage.vue
  28. 4 4
      src/views/system/user.vue

+ 8 - 2
src/views/boxManagement/agentBox/detailsPage.vue

@@ -309,6 +309,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
               <template slot="menu" slot-scope="{ row, index }">
                 <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                   @click="polRowDel(row, index)">删 除</el-button>
@@ -1303,7 +1308,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            // cell: true,
+            width:150,
             overHidden: true
           }
         ]
@@ -2176,7 +2182,7 @@ export default {
             }
           }
           for (let row of this.form.feeCenterList) {
-             row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
+            row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
             if (!row.billType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
               this.$refs.crud2.rowCell(row, row.$index)
               return this.$message.error("请完善费用明细");

+ 8 - 2
src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -277,6 +277,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
               <template slot="menu" slot-scope="{ row, index }">
                 <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                   @click="polRowDel(row, index)">删 除</el-button>
@@ -1181,7 +1186,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            // cell: true,
+            width: 150,
             overHidden: true
           }
         ]
@@ -1875,7 +1881,7 @@ export default {
             }
           }
           for (let row of this.form.feeCenterList) {
-             row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
+            row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
             if (!row.billType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
               this.$refs.crud2.rowCell(row, row.$index)
               return this.$message.error("请完善费用明细");

+ 15 - 3
src/views/boxManagement/boxCost/detailsPage.vue

@@ -250,6 +250,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <el-card
@@ -343,6 +348,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud4"
@@ -1326,7 +1336,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            // cell: true,
+            width:150,
             overHidden: true
           }
         ]
@@ -1540,7 +1551,7 @@ export default {
               }
             ]
           },
-           {
+          {
             label: "CNY",
             prop: "amountCNY",
             width: "100",
@@ -1597,7 +1608,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            // cell: true,
+            width:150,
             overHidden: true
           }
         ]

+ 7 - 1
src/views/boxManagement/boxExit/detailsPage.vue

@@ -289,6 +289,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
               <template slot="menu" slot-scope="{ row, index }">
                 <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                   @click="polRowDel(row, index)">删 除</el-button>
@@ -1235,6 +1240,7 @@ export default {
             label: "备注",
             prop: "remarks",
             cell: true,
+            width: 150,
             overHidden: true
           }
         ]
@@ -1923,7 +1929,7 @@ export default {
             }
           }
           for (let row of this.form.feeCenterList) {
-             row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
+            row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
             if (!row.billType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
               this.$refs.crud2.rowCell(row, row.$index)
               return this.$message.error("请完善费用明细");

+ 7 - 1
src/views/boxManagement/buyContainer/detailsPage.vue

@@ -245,6 +245,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
               <template slot="menu" slot-scope="{ row, index }">
                 <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                   @click="polRowDel(row, index)">删 除</el-button>
@@ -1137,7 +1142,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            // cell: true,
+            width: 150,
             overHidden: true
           }
         ]

+ 7 - 1
src/views/boxManagement/rentalBox/detailsPage.vue

@@ -288,6 +288,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
               <template slot="menu" slot-scope="{ row, index }">
                 <el-button size="small" icon="el-icon-delete" type="text" :disabled="editDisabled"
                   @click="polRowDel(row, index)">删 除</el-button>
@@ -1350,6 +1355,7 @@ export default {
             label: "备注",
             prop: "remarks",
             cell: true,
+            width: 150,
             overHidden: true
           }
         ]
@@ -2424,7 +2430,7 @@ export default {
             }
           }
           for (let row of this.form.feeCenterList) {
-             row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
+            row.amount = row.curCode == 'CNY' ? row.amountCNY : row.amountUSD
             if (!row.billType || !row.corpCnName || !row.feeCnName || !row.curCode || !row.price || !row.quantity) {
               this.$refs.crud2.rowCell(row, row.$index)
               return this.$message.error("请完善费用明细");

+ 8 - 8
src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -436,7 +436,7 @@
                             </span>
                             <el-date-picker v-model="assemblyForm.actualEta" clearable style="width: 100%" type="date"
                                 size="small"
-                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                 value-format="yyyy-MM-dd" :picker-options="etdPickerOptions" placeholder="请选择ATA日期"
                                 @change="handlePick">
                             </el-date-picker>
@@ -501,7 +501,7 @@
                                 </span>
                                 <search-query :datalist="vesselData" :selectValue="assemblyForm.vesselEnName"
                                     :filterable="true" :clearable="true" :remote="true" :allowCreate="true"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     :buttonIf="false" placeholder="请选择船名"
                                     :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                     @remoteMethod="remoteMethod($event, 'vessel')"
@@ -515,7 +515,7 @@
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
                                     autocomplete="off"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     clearable placeholder="请输入航次"></el-input>
                             </el-form-item>
                         </div>
@@ -551,7 +551,7 @@
                                     </span>
                                     <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
                                         :filterable="true" :clearable="true" :remote="true" :joinData="true"
-                                        :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                        :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                         :buttonIf="false" placeholder="请选择船公司"
                                         :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }"
                                         @remoteMethod="remoteMethod($event, 'carrier')"
@@ -677,7 +677,7 @@
                                         :url="'/blade-user/userListAll?roleAlias=操作员&deptId=' + saberUserInfo.dept_pid.split(',')[0]"
                                         :filterable="true" dataName="realName"
                                         @selectChange="dicChange('operatorName', $event)"
-                                        :disabled="detailData.seeDisabled"></dic-select>
+                                        :disabled="detailData.seeDisabled|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="11">
@@ -690,7 +690,7 @@
                                         :url="'/blade-user/userListAll?roleAlias=客服&deptId=' + saberUserInfo.dept_pid.split(',')[0]"
                                         :filterable="true" dataName="realName"
                                         @selectChange="dicChange('accDeptName', $event)"
-                                        :disabled="detailData.seeDisabled"></dic-select>
+                                        :disabled="detailData.seeDisabled|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                         </div>
@@ -704,7 +704,7 @@
                                         label="deptName" url="/blade-system/dept/top-list" :filterable="true"
                                         :remote="true" dataName="deptName"
                                         @selectChange="dicChange('branchName', $event)"
-                                        :disabled="detailData.seeDisabled||!(roleName.includes('admin')||roleName.includes('总部'))"></dic-select>
+                                        :disabled="detailData.seeDisabled||!(roleName.includes('admin')||roleName.includes('总部'))|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                         </div>
@@ -787,7 +787,7 @@
                                     @click="emailJump('cy')">POD场站</span>
                             </span>
                             <search-query :datalist="podCyData" :selectValue="assemblyForm.podCyCnName"
-                                :filterable="true" :clearable="true" :remote="true"
+                                :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
                                 @remoteMethod="remoteMethod($event, 'podCyCnName')"
                                 @corpChange="corpChange($event, 'podCyCnName')"

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -76,7 +76,7 @@
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="isFeeEditD" type="primary" plain size="small"
+                    <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>

+ 12 - 9
src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue

@@ -103,10 +103,11 @@
                             <span style="color: #1e9fff">航线</span>
                         </span>
                         <search-query :datalist="lineData" :selectValue="assemblyForm.lineCnName" :filterable="true"
-                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)" :buttonIf="false"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择航线"
-                            @remoteMethod="remoteMethod($event, 'line')" @corpChange="corpChange($event, 'line')"
-                            @corpFocus="remoteMethod($event, 'line')">
+                            :clearable="true" :remote="true"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            placeholder="请选择航线" @remoteMethod="remoteMethod($event, 'line')"
+                            @corpChange="corpChange($event, 'line')" @corpFocus="remoteMethod($event, 'line')">
                         </search-query>
                     </el-form-item>
                 </el-col>
@@ -116,14 +117,15 @@
                             <el-col :span="10">
                                 <search-query :datalist="sourceTypeData" :selectValue="assemblyForm.srcType"
                                     :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
+                                    :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     placeholder="请选择业务来源" @corpChange="sourceCorp($event, 'srcType')">
                                 </search-query>
                             </el-col>
                             <el-col :span="13">
                                 <search-query :datalist="srcData" :selectValue="assemblyForm.srcCnName"
                                     :filterable="true" :clearable="true" :remote="true"
-                                    :disabled="!assemblyForm.srcType || detailData.seeDisabled" :buttonIf="false"
-                                    :forParameter="sourceforParameter" placeholder="请选择来源明细"
+                                    :disabled="!assemblyForm.srcType || detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                    :buttonIf="false" :forParameter="sourceforParameter" placeholder="请选择来源明细"
                                     @remoteMethod="sourceRemote($event, 'srcCnName')"
                                     @corpChange="sourceCorp($event, 'srcCnName')"
                                     @corpFocus="sourceRemote($event, 'srcCnName')">
@@ -160,7 +162,7 @@
                             <span style="color: #1e9fff">POL免箱使天数</span>
                         </span>
                         <el-input v-model="assemblyForm.polFreeBoxUseDays" size="small" :controls="false"
-                            style="width: 100%;" placeholder="请输入POL免箱使天数"></el-input>
+                            style="width: 100%;" placeholder="请输入POL免箱使天数" :disabled="detailData.seeDisabled"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -169,7 +171,7 @@
                             <span style="color: #1e9fff">POD免箱使天数</span>
                         </span>
                         <el-input v-model="assemblyForm.podFreeBoxUseDays" size="small" :controls="false"
-                            style="width: 100%;" placeholder="请输入POD免箱使天数"></el-input>
+                            style="width: 100%;" placeholder="请输入POD免箱使天数" :disabled="detailData.seeDisabled"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -181,7 +183,8 @@
                             label="shortName" res="records"
                             url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=船代" :filterable="true"
                             :remote="true" dataName="shortName" @selectChange="dicChange('shippingAgencyCname', $event)"
-                            :slotRight="true" rightLabel="code" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"></dic-select>
+                            :slotRight="true" rightLabel="code"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"></dic-select>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">

+ 1 - 1
src/views/iosBasicData/OceanFreightImport/bills/assembly/mbinformation.vue

@@ -126,7 +126,7 @@
                                     <span style="color: #1e9fff">ETA</span>
                                 </span>
                                 <el-date-picker v-model="assemblyForm.eta" clearable type="date" size="small"
-                                    :disabled="detailData.seeDisabled" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="detailData.seeDisabled|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length" value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="选择日期">
                                 </el-date-picker>
                             </el-form-item>

+ 333 - 364
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -80,9 +80,10 @@
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1 && form.billType != 'MH'" @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock"
-                    v-if="(form.status == 0 || form.status == 4 && form.billType != 'MH')"
-                    @click.stop="DocumentApproval">单据请核
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock" v-if="
+                    form.status == 0 ||
+                    (form.status == 4 && form.billType != 'MH')
+                " @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px"
                     :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
@@ -109,7 +110,8 @@
                             <containerTitle title="基础资料"></containerTitle>
                             <basic-container>
                                 <el-row :gutter="60">
-                                    <el-col v-for="(item, index) in basicData.column" :key="index" :span="8">
+                                    <el-col v-for="(item,
+                                        index) in basicData.column" :key="index" :span="8">
                                         <!--数组-->
                                         <div v-if="item instanceof Array"
                                             style="display: flex;align-items: center;justify-content: space-between">
@@ -190,15 +192,10 @@
                                                                                     )
                                                                                     ">
                                                         </search-query>
-                                                        <el-input v-else type="age" style="width: 100%;" v-model="form[
-                                                            item[0].prop
-                                                        ]
-                                                            " size="small" autocomplete="off" :disabled="detailData.seeDisabled ||
-                                                                item[0]
-                                                                    .disabled
-                                                                " :placeholder="item[0].text ||
-                                                                    ''
-                                                                    "></el-input>
+                                                        <el-input v-else type="age" style="width: 100%;" v-model="form[item[0].prop]
+                                                            " size="small" autocomplete="off"
+                                                            :disabled="detailData.seeDisabled || item[0].disabled || form.feeCenterListD.filter(item => item.auditStatus > 0).length || form.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                                            :placeholder="item[0].text || ''"></el-input>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="item[1].span
@@ -226,37 +223,13 @@
                                                                     .disabled
                                                                 " value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
                                                         </el-date-picker>
-                                                        <search-query v-else-if="
-                                                            item[1].type ==
-                                                            'select'
-                                                        " :datalist="item[1].dicData
-                                                            " :selectValue="form[
-                                                                item[1].prop
-                                                            ]
-                                                                " :filterable="true" :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
-                                                                                    )
-                                                                                    " @corpFocus="
-                                                                                    remoteMethod(
-                                                                                        $event,
-                                                                                        item[1].prop
-                                                                                    )
-                                                                                    ">
+                                                        <search-query v-else-if="item[1].type == 'select'"
+                                                            :datalist="item[1].dicData" :selectValue="form[item[1].prop]" :filterable="true" :remote="true"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled || form.feeCenterListD.filter(item => item.auditStatus > 0).length || form.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                                            :buttonIf="false" :placeholder="`${item[1].text || ''}`"
+                                                            :forParameter="item[1].forParameter" @remoteMethod="remoteMethod($event, item[1].prop)"
+                                                            @corpChange="corpChange($event, item[1].prop)"
+                                                            @corpFocus="remoteMethod($event, item[1].prop)">
                                                         </search-query>
 
                                                         <tree-select v-else-if="
@@ -363,21 +336,20 @@
                                                 <search-query v-if="item.type == 'select'" ref="searchQueryRef"
                                                     :datalist="item.dicData" :selectValue="form[item.prop]
                                                         " :filterable="true" :clearable="false" :remote="true"
-                                                    :disabled="detailData.seeDisabled ||
-                                                        item.disabled
-                                                        " :buttonIf="item.buttonIf" :forParameter="item.forParameter
-                                                            " :placeholder="`${item.text || ''}`
-                                                                " :joinData="item.joinData" @remoteMethod="
-                                                                    remoteMethod(
+                                                    :disabled="detailData.seeDisabled || item.disabled || form.feeCenterListD.filter(item => item.auditStatus > 0).length || form.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                                    :buttonIf="item.buttonIf" :forParameter="item.forParameter
+                                                        " :placeholder="`${item.text || ''}`
+                                                            " :joinData="item.joinData" @remoteMethod="
+                                                                remoteMethod(
+                                                                    $event,
+                                                                    item.prop
+                                                                )
+                                                                " @corpChange="
+                                                                    corpChange(
                                                                         $event,
                                                                         item.prop
                                                                     )
-                                                                    " @corpChange="
-                                                                        corpChange(
-                                                                            $event,
-                                                                            item.prop
-                                                                        )
-                                                                        " @corpFocus="
+                                                                    " @corpFocus="
                                                                             remoteMethod(
                                                                                 $event,
                                                                                 item.prop
@@ -505,7 +477,7 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports v-if='previewDialog' :id="form.id" :classifycode="getReportTypeByBigHandle()"
+            <business-reports v-if="previewDialog" :id="form.id" :classifycode="getReportTypeByBigHandle()"
                 :disabled="detailData.seeDisabled"></business-reports>
         </el-dialog>
     </div>
@@ -520,35 +492,18 @@ import edicode from "@/views/iosBasicData/OceanFreightImport/bills/assembly/edic
 import filescenter from "@/views/iosBasicData/OceanFreightImport/bills/assembly/filescenter.vue";
 import DistributionBox from "@/views/iosBasicData/OceanFreightImport/bills/assembly/DistributionBox.vue";
 import feecenter from "@/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue";
-import {
-    getList as userGetList
-} from "@/api/system/user";
+import { getList as userGetList } from "@/api/system/user";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import bcorps from "@/views/iosBasicData/bcorps/index.vue";
 import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue";
 import SplitList from "@/views/iosBasicData/OceanFreightImport/bills/assembly/SplitList.vue";
-import {
-    getLazylist
-} from "@/api/basicData/agreement";
-import {
-    getBcorpsList,
-    getBcorpslistByType
-} from "@/api/iosBasicData/bcorps";
-import {
-    getBlocationsList
-} from "@/api/iosBasicData/blocations";
-import {
-    getBcorpsattnList
-} from "@/api/iosBasicData/bcorpsattn";
-import {
-    getWorkDicts
-} from "@/api/system/dictbiz";
-import {
-    getDeptLazyTree,
-    getDeptTree,
-    getLazyList
-} from "@/api/system/dept";
+import { getLazylist } from "@/api/basicData/agreement";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { getBlocationsList } from "@/api/iosBasicData/blocations";
+import { getBcorpsattnList } from "@/api/iosBasicData/bcorpsattn";
+import { getWorkDicts } from "@/api/system/dictbiz";
+import { getDeptLazyTree, getDeptTree, getLazyList } from "@/api/system/dept";
 import {
     billsCheckBills,
     billsCopyBills,
@@ -569,36 +524,18 @@ import {
     returningSecurityMoney,
     revokeReturningSecurityMoney
 } from "@/api/iosBasicData/bills";
-import {
-    dateFormat
-} from "@/util/date";
+import { dateFormat } from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
-import {
-    getBvesselsList
-} from "@/api/iosBasicData/bvessels";
+import { getBvesselsList } from "@/api/iosBasicData/bvessels";
 import DocumentCenter from "@/views/iosBasicData/OceanFreightImport/bills/assembly/DocumentCenter.vue";
 import businessReports from "@/views/iosBasicData/OceanFreightImport/bills/assembly/businessReports.vue";
-import {
-    popupReminder
-} from "@/util/messageReminder";
+import { popupReminder } from "@/util/messageReminder";
 import editypes from "@/views/iosBasicData/editypes/index.vue";
-import {
-    editypesList
-} from "@/api/iosBasicData/editypes";
-import {
-    verifyEnglish,
-    checkFullWidthSymbols
-} from "@/util/date";
-import {
-    contrastObj,
-    contrastList
-} from "@/util/contrastData";
-import {
-    selectListLos
-} from "@/api/approval/processConfig";
-import {
-    isProcurement
-} from "@/api/basicData/configuration";
+import { editypesList } from "@/api/iosBasicData/editypes";
+import { verifyEnglish, checkFullWidthSymbols } from "@/util/date";
+import { contrastObj, contrastList } from "@/util/contrastData";
+import { selectListLos } from "@/api/approval/processConfig";
+import { isProcurement } from "@/api/basicData/configuration";
 import _ from "lodash";
 export default {
     components: {
@@ -644,8 +581,10 @@ export default {
             copyFormData: {}, // 详情的备份数据
             // 详情数据
             form: {
-                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
-                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                branchId: JSON.parse(localStorage.getItem("sysitemData"))
+                    .deptId,
+                branchName: JSON.parse(localStorage.getItem("sysitemData"))
+                    .deptName,
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00", // 单据日期 默认 当天
                 operatorName: JSON.parse(localStorage.getItem("saber-userInfo"))
                     .content.user_name, // OP 默认登录人
@@ -658,10 +597,11 @@ export default {
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
-                loadType: JSON.parse(localStorage.getItem("saber-tenantId"))
-                    .content == "409341" ?
-                    "FCL" :
-                    "整箱", // 装箱方式默认整箱
+                loadType:
+                    JSON.parse(localStorage.getItem("saber-tenantId"))
+                        .content == "409341"
+                        ? "FCL"
+                        : "整箱", // 装箱方式默认整箱
                 srcType: "OWN", // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: "THREE", // 正本份数 默认 THREE
                 numberOfCopy: "THREE", // 副本份数 默认 THREE
@@ -692,11 +632,15 @@ export default {
                 hmmEdi: {}
             },
             oldForm: {
-                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
-                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
+                branchId: JSON.parse(localStorage.getItem("sysitemData"))
+                    .deptId,
+                branchName: JSON.parse(localStorage.getItem("sysitemData"))
+                    .deptName,
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00", // 单据日期 默认 当天
-                operatorName: JSON.parse(localStorage.getItem("saber-userInfo")).content.user_name, // OP 默认登录人
-                operatorId: JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id, // OP 默认登录人
+                operatorName: JSON.parse(localStorage.getItem("saber-userInfo"))
+                    .content.user_name, // OP 默认登录人
+                operatorId: JSON.parse(localStorage.getItem("saber-userInfo"))
+                    .content.user_id, // OP 默认登录人
                 businessType: "SI", // 业务类型 默认 海运出口
                 businessTypes: "海运",
                 billType: "DD", // 单据类型 默认 直单
@@ -704,10 +648,11 @@ export default {
                 issueType: "ORI", // 签单方式 默认 正本提单
                 mpaymode: "PP", // 主单付费方式 默认PP
                 hpaymode: "PP", // 分单付费方式 默认 PP
-                loadType: JSON.parse(localStorage.getItem("saber-tenantId"))
-                    .content == "409341" ?
-                    "FCL" :
-                    "整箱", // 装箱方式默认整箱
+                loadType:
+                    JSON.parse(localStorage.getItem("saber-tenantId"))
+                        .content == "409341"
+                        ? "FCL"
+                        : "整箱", // 装箱方式默认整箱
                 srcType: "OWN", // 业务来源默认公司   来源 内容 默认登录人所属公司
                 numberOfObl: "THREE", // 正本份数 默认 THREE
                 numberOfCopy: "THREE", // 副本份数 默认 THREE
@@ -739,66 +684,70 @@ export default {
             },
             // 循环的配置
             basicData: {
-                column: [{
-                    label: "客户简称", // 调往来单位接口
-                    prop: "corpCnName",
-                    text: "请选择客户名称",
-                    type: "select",
-                    dicData: [],
-                    disabled: false,
-                    buttonIf: true,
-                    joinData: true,
-                    slot: "bcorps",
-                    display: true,
-                    forParameter: {
-                        key: "id",
-                        label: "cnName",
-                        value: "cnName",
-                        short: "shortName"
+                column: [
+                    {
+                        label: "客户简称", // 调往来单位接口
+                        prop: "corpCnName",
+                        text: "请选择客户名称",
+                        type: "select",
+                        dicData: [],
+                        disabled: false,
+                        buttonIf: true,
+                        joinData: true,
+                        slot: "bcorps",
+                        display: true,
+                        forParameter: {
+                            key: "id",
+                            label: "cnName",
+                            value: "cnName",
+                            short: "shortName"
+                        },
+                        rules: [
+                            {
+                                required: true,
+                                message: " ",
+                                trigger: "blur"
+                            }
+                        ]
                     },
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: "booking NO", // 订舱号
-                    text: "请输入booking NO",
-                    prop: "bookingNo",
-                    disabled: false,
-                    display: true,
-                },
-                {
-                    label: "HB/L NO",
-                    text: "请输入MB/L NO",
-                    prop: "hblno",
-                    disabled: false,
-                    display: false,
-                },
-                [{
-                    label: "MB/L NO",
-                    text: "请输入MB/L NO",
-                    prop: "mblno",
-                    span: 18,
-                    disabled: false,
-                },
-                {
-                    label: "", // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
-                    text: "请选择付款方式",
-                    prop: "mpaymode",
-                    type: 'select',
-                    labelWidth: '30px',
-                    disabled: false,
-                    span: 6,
-                    dicData: [],
-                    forParameter: {
-                        key: 'dictKey',
-                        label: 'dictValue',
-                        value: 'dictKey',
+                    {
+                        label: "booking NO", // 订舱号
+                        text: "请输入booking NO",
+                        prop: "bookingNo",
+                        disabled: false,
+                        display: true
                     },
-                },
-                ],
+                    {
+                        label: "HB/L NO",
+                        text: "请输入MB/L NO",
+                        prop: "hblno",
+                        disabled: false,
+                        display: false
+                    },
+                    [
+                        {
+                            label: "MB/L NO",
+                            text: "请输入MB/L NO",
+                            prop: "mblno",
+                            span: 18,
+                            disabled: false
+                        },
+                        {
+                            label: "", // MB/L 付款方式 PP=预付, CC=到付, FPA, Other
+                            text: "请选择付款方式",
+                            prop: "mpaymode",
+                            type: "select",
+                            labelWidth: "30px",
+                            disabled: false,
+                            span: 6,
+                            dicData: [],
+                            forParameter: {
+                                key: "dictKey",
+                                label: "dictValue",
+                                value: "dictKey"
+                            }
+                        }
+                    ]
                     // [
                     //     {
                     //         label: "OP",  // 操作id 用户管理下拉 模糊搜索
@@ -844,94 +793,98 @@ export default {
             saberUserInfo: {}, // 当前登录人信息
             roleName: [], // 当前的角色权限
             // 需要加判断是否必填的数据
-            messageData: [{
-                name: "客户",
-                value: "corpCnName"
-            },
-            {
-                name: "业务来源",
-                value: "srcType"
-            },
-            {
-                name: "MBLNO",
-                value: "mblno"
-            },
-            // {
-            //     name: 'booking NO',
-            //     value: 'bookingNo',
-            // },
-            // {
-            //     name: 'REF MBLNO',
-            //     value: 'refno',
-            // },
-            {
-                name: "船名(VSL)",
-                value: "vesselCnName"
-            },
-            {
-                name: "航次(VOY)",
-                value: "voyageNo"
-            },
-            // {
-            //     name: 'ETD',
-            //     value: 'etd',
-            // },
-            {
-                name: "装货港",
-                value: "polCnName"
-            },
-            {
-                name: "目的港",
-                value: "destinationNamePrint"
-            },
-            // {
-            //     name: '包装单位',
-            //     value: 'packingUnit',
-            // },
-            {
-                name: "船公司",
-                value: "carrierCnName"
-            },
-            {
-                name: "场站",
-                value: "cyCnName"
-            }
+            messageData: [
+                {
+                    name: "客户",
+                    value: "corpCnName"
+                },
+                {
+                    name: "业务来源",
+                    value: "srcType"
+                },
+                {
+                    name: "MBLNO",
+                    value: "mblno"
+                },
+                // {
+                //     name: 'booking NO',
+                //     value: 'bookingNo',
+                // },
+                // {
+                //     name: 'REF MBLNO',
+                //     value: 'refno',
+                // },
+                {
+                    name: "船名(VSL)",
+                    value: "vesselCnName"
+                },
+                {
+                    name: "航次(VOY)",
+                    value: "voyageNo"
+                },
+                // {
+                //     name: 'ETD',
+                //     value: 'etd',
+                // },
+                {
+                    name: "装货港",
+                    value: "polCnName"
+                },
+                {
+                    name: "目的港",
+                    value: "destinationNamePrint"
+                },
+                // {
+                //     name: '包装单位',
+                //     value: 'packingUnit',
+                // },
+                {
+                    name: "船公司",
+                    value: "carrierCnName"
+                },
+                {
+                    name: "场站",
+                    value: "podCyCnName"
+                }
             ],
-            imporiData: [{
-                id: 0,
-                name: "导入 ONE 模板"
-            },
-            {
-                id: 1,
-                name: "导入 PIL 订舱模板"
-            },
-            {
-                id: 2,
-                name: "导入截单格式"
-            },
-            {
-                id: 3,
-                name: "导入海信提单"
-            }
+            imporiData: [
+                {
+                    id: 0,
+                    name: "导入 ONE 模板"
+                },
+                {
+                    id: 1,
+                    name: "导入 PIL 订舱模板"
+                },
+                {
+                    id: 2,
+                    name: "导入截单格式"
+                },
+                {
+                    id: 3,
+                    name: "导入海信提单"
+                }
             ],
             excelForm: {},
             excelLoading: false,
             excelOption: {
                 submitBtn: false,
                 emptyBtn: false,
-                column: [{
-                    label: "模板上传",
-                    prop: "excelFile",
-                    type: "upload",
-                    drag: true,
-                    loadText: "模板上传中,请稍等",
-                    span: 24,
-                    propsHttp: {
-                        res: "data"
-                    },
-                    tip: "请上传 .xls,.xlsx 标准格式文件",
-                    action: "api/blade-los/templateImport/importOne"
-                }]
+                column: [
+                    {
+                        label: "模板上传",
+                        prop: "excelFile",
+                        type: "upload",
+                        drag: true,
+                        loadText: "模板上传中,请稍等",
+                        span: 24,
+                        propsHttp: {
+                            res: "data"
+                        },
+                        tip: "请上传 .xls,.xlsx 标准格式文件",
+                        action: "api/blade-los/templateImport/importOne"
+                    }
+                ]
             },
             excelBox: false,
             saberTenantId: 0
@@ -1117,22 +1070,25 @@ export default {
                     submitText: "确认",
                     emptyText: "取消",
                     span: 24,
-                    column: [{
-                        label: "复制类型",
-                        prop: "checkbox",
-                        type: "checkbox",
-                        dicData: [{
-                            label: "复制费用",
-                            value: "复制费用"
-                        },
+                    column: [
                         {
-                            label: "复制箱型箱量",
-                            value: "复制箱型箱量"
+                            label: "复制类型",
+                            prop: "checkbox",
+                            type: "checkbox",
+                            dicData: [
+                                {
+                                    label: "复制费用",
+                                    value: "复制费用"
+                                },
+                                {
+                                    label: "复制箱型箱量",
+                                    value: "复制箱型箱量"
+                                }
+                            ],
+                            dataType: "string",
+                            span: 24
                         }
-                        ],
-                        dataType: "string",
-                        span: 24
-                    }]
+                    ]
                 },
                 beforeClose: done => {
                     done();
@@ -1147,17 +1103,13 @@ export default {
         //文档导入
         importData(row) {
             if (row == 0) {
-                this.excelOption.column[0].action =
-                    `/api/blade-los/templateImport/importOne?billId=${this.form.id}`;
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importOne?billId=${this.form.id}`;
             } else if (row == 1) {
-                this.excelOption.column[0].action =
-                    `/api/blade-los/templateImport/importPilBooking?billId=${this.form.id}`;
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importPilBooking?billId=${this.form.id}`;
             } else if (row == 2) {
-                this.excelOption.column[0].action =
-                    `/api/blade-los/templateImport/importPilCutOffOrders?billId=${this.form.id}`;
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importPilCutOffOrders?billId=${this.form.id}`;
             } else if (row == 3) {
-                this.excelOption.column[0].action =
-                    `/api/blade-los/templateImport/importHisenseBill?billId=${this.form.id}`;
+                this.excelOption.column[0].action = `/api/blade-los/templateImport/importHisenseBill?billId=${this.form.id}`;
             }
             this.excelBox = true;
         },
@@ -1557,7 +1509,7 @@ export default {
         },
         // 报表弹窗
         previewDialogfun() {
-            this.getReportTypeByBigHandle('业务')
+            this.getReportTypeByBigHandle("业务");
             this.previewDialog = true;
         },
         //请核关闭
@@ -1569,20 +1521,34 @@ export default {
             deptGetDetailPol(this.saberUserInfo.dept_pid.split(",")[0]).then(
                 res => {
                     // 收货地
-                    this.form.placeReceiptName = res.data.data.polEnName ? res.data.data.polEnName.split(",")[
-                        0] : null;
-                    this.form.placeReceiptId = res.data.data.polId ? res.data.data.polId.split(",")[0] : null;
-                    this.form.placeReceiptCode = res.data.data.polCode ? res.data.data.polCode.split(",")[0] :
-                        null;
-                    this.form.placeReceiptNamePrint = res.data.data.polEnName ? res.data.data.polEnName.split(
-                        ",")[0] : null;
+                    this.form.placeReceiptName = res.data.data.polEnName
+                        ? res.data.data.polEnName.split(",")[0]
+                        : null;
+                    this.form.placeReceiptId = res.data.data.polId
+                        ? res.data.data.polId.split(",")[0]
+                        : null;
+                    this.form.placeReceiptCode = res.data.data.polCode
+                        ? res.data.data.polCode.split(",")[0]
+                        : null;
+                    this.form.placeReceiptNamePrint = res.data.data.polEnName
+                        ? res.data.data.polEnName.split(",")[0]
+                        : null;
                     // 装货港
-                    this.form.polCnName = res.data.data.polCnName ? res.data.data.polCnName.split(",")[0] : null
-                    this.form.polEnName = res.data.data.polEnName ? res.data.data.polEnName.split(",")[0] : null
-                    this.form.polId = res.data.data.polId ? res.data.data.polId.split(",")[0] : null
-                    this.form.polCode = res.data.data.polCode ? res.data.data.polCode.split(",")[0] : null
-                    this.form.polNamePrint = res.data.data.polEnName ? res.data.data.polEnName.split(",")[0] :
-                        null
+                    this.form.polCnName = res.data.data.polCnName
+                        ? res.data.data.polCnName.split(",")[0]
+                        : null;
+                    this.form.polEnName = res.data.data.polEnName
+                        ? res.data.data.polEnName.split(",")[0]
+                        : null;
+                    this.form.polId = res.data.data.polId
+                        ? res.data.data.polId.split(",")[0]
+                        : null;
+                    this.form.polCode = res.data.data.polCode
+                        ? res.data.data.polCode.split(",")[0]
+                        : null;
+                    this.form.polNamePrint = res.data.data.polEnName
+                        ? res.data.data.polEnName.split(",")[0]
+                        : null;
                     // 签单地点 默认 装货港
                     this.$set(this.form, "issueAtId", this.form.polId);
                     this.$set(this.form, "issueAt", this.form.polEnName);
@@ -1631,10 +1597,10 @@ export default {
         },
         // 获取付款方式字典数据
         mpaymodeWorkDictsfun() {
-            getWorkDicts('payment_method_los').then((res) => {
-                this.columnforfun('mpaymode').dicData = res.data.data
+            getWorkDicts("payment_method_los").then(res => {
+                this.columnforfun("mpaymode").dicData = res.data.data;
                 // this.columnforfun('hpaymode').dicData = res.data.data
-            })
+            });
         },
         // 获取核算部分数据 // 机构管理接口
         getLazylistfun() {
@@ -2107,15 +2073,25 @@ export default {
             //         }
             //     }
             // }
-            else if (name == 'mpaymode') {
+            else if (name == "mpaymode") {
                 // 主单付费方式
-                this.form[name] = value
-                if (value == 'PP') {
-                    this.$set(this.form, 'mpayplace', this.form.polEnName ? this.form.polEnName.split(' - ')[0] :
-                        '')
+                this.form[name] = value;
+                if (value == "PP") {
+                    this.$set(
+                        this.form,
+                        "mpayplace",
+                        this.form.polEnName
+                            ? this.form.polEnName.split(" - ")[0]
+                            : ""
+                    );
                 } else {
-                    this.$set(this.form, 'mpayplace', this.form.podEnName ? this.form.podEnName.split(' - ')[0] :
-                        '')
+                    this.$set(
+                        this.form,
+                        "mpayplace",
+                        this.form.podEnName
+                            ? this.form.podEnName.split(" - ")[0]
+                            : ""
+                    );
                 }
             }
             // else if (name == 'hpaymode') {
@@ -2305,7 +2281,8 @@ export default {
                 this.pageLoading = true;
                 billsCheckBills({
                     id: this.form.id,
-                    url: "/iosBasicData/OceanFreightImport/bills/approvalDetails",
+                    url:
+                        "/iosBasicData/OceanFreightImport/bills/approvalDetails",
                     pageStatus: "this.$store.getters.approvalDetails",
                     pageLabel: "审批详情(F)"
                 })
@@ -2396,25 +2373,20 @@ export default {
                         }
                     }
                     for (let item of this.form.feeCenterListD) {
-                        if (
-                            !item.corpId ||
-                            !item.feeId ||
-                            !item.curCode
-                        ) {
+                        if (!item.corpId || !item.feeId || !item.curCode) {
                             msgs.push(
                                 `应收第${item.$index + 1}行${!item.corpId ? " 往来单位" : ""
-                                }${!item.feeId ? " 费用简称" : ""}${!item.curCode ? " 币种" : ""}`
+                                }${!item.feeId ? " 费用简称" : ""}${!item.curCode ? " 币种" : ""
+                                }`
                             );
                         }
                     }
                     for (let item of this.form.feeCenterListC) {
-                        if (
-                            !item.corpId ||
-                            !item.feeId ||
-                            !item.curCode
-                        ) {
+                        if (!item.corpId || !item.feeId || !item.curCode) {
                             msgs.push(
-                                `应付第${item.$index + 1}行${!item.corpId ? " 往来单位" : ""}${!item.feeId ? " 费用简称" : ""}${!item.curCode ? " 币种" : ""}`
+                                `应付第${item.$index + 1}行${!item.corpId ? " 往来单位" : ""
+                                }${!item.feeId ? " 费用简称" : ""}${!item.curCode ? " 币种" : ""
+                                }`
                             );
                         }
                     }
@@ -2748,23 +2720,23 @@ export default {
                 // 税额 = 净额 * 总税率
                 // 含税
                 if (row.curCode == this.getLocalCurrency()) {
-                    row.amount = row.rmbAmount ?
-                        row.rmbAmount :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amount = row.rmbAmount
+                        ? row.rmbAmount
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 } else {
-                    row.amount = row.usdAmount ?
-                        row.usdAmount :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amount = row.usdAmount
+                        ? row.usdAmount
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 }
                 // 净额
                 if (row.curCode == this.getLocalCurrency()) {
-                    row.amountNet = row.rmbAmountNet ?
-                        row.rmbAmountNet :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amountNet = row.rmbAmountNet
+                        ? row.rmbAmountNet
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 } else {
-                    row.amountNet = row.usdAmountNet ?
-                        row.usdAmountNet :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amountNet = row.usdAmountNet
+                        ? row.usdAmountNet
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 }
             });
             // 费用 付 赋值数据
@@ -2803,23 +2775,23 @@ export default {
                 // 税额 = 净额 * 总税率
                 // 含税
                 if (row.curCode == this.getLocalCurrency()) {
-                    row.amount = row.rmbAmount ?
-                        row.rmbAmount :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amount = row.rmbAmount
+                        ? row.rmbAmount
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 } else {
-                    row.amount = row.usdAmount ?
-                        row.usdAmount :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amount = row.usdAmount
+                        ? row.usdAmount
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 }
                 // 净额
                 if (row.curCode == this.getLocalCurrency()) {
-                    row.amountNet = row.rmbAmountNet ?
-                        row.rmbAmountNet :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amountNet = row.rmbAmountNet
+                        ? row.rmbAmountNet
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 } else {
-                    row.amountNet = row.usdAmountNet ?
-                        row.usdAmountNet :
-                        (Number(row.quantity) * Number(row.price)).toFixed(2);
+                    row.amountNet = row.usdAmountNet
+                        ? row.usdAmountNet
+                        : (Number(row.quantity) * Number(row.price)).toFixed(2);
                 }
             });
             this.pageLoading = true;
@@ -2884,7 +2856,7 @@ export default {
             });
             let res = await billsCopyBills({
                 id
-            })
+            });
             loading.close();
             let types = typeof type == "string" ? type.split(",") : [];
             // if (type == '复制费用' || type == '') {
@@ -2901,7 +2873,7 @@ export default {
                 res.data.data.feeCenterListD = [];
                 res.data.data.feeCenterListC = [];
             }
-            await this.saveLocalCurrency(res.data.data.branchId)
+            await this.saveLocalCurrency(res.data.data.branchId);
             this.form = res.data.data;
             this.pageLoading = false;
             // this.searchMontage() // 下拉 中文名称和编号拼接
@@ -2975,11 +2947,11 @@ export default {
 
             this.copyFormData = JSON.parse(JSON.stringify(res.data.data));
             // 如果已经请核就禁用按钮
-            // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
-            //     this.detailData.seeDisabled = true
-            // }else {
-            //     this.detailData.seeDisabled = false
-            // }
+            if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
+                this.detailData.seeDisabled = true
+            }else {
+                this.detailData.seeDisabled = false
+            }
             // this.columnforfun('teamName').disabled = true
 
             // this.columnforfun('operatorName').disabled = true
@@ -3029,13 +3001,12 @@ export default {
             for (let item of this.form.feeCenterListD) {
                 // 判断是否生成了账单
                 if (item.accStatus == 1) {
+                    this.generateBillsfalse = true;
                     this.columnforfun("corpCnName").disabled = true;
-                    this.columnforfun("srcType").disabled = true;
+                    // this.columnforfun('srcType').disabled = true
                     this.columnforfun("mblno").disabled = true;
                     this.columnforfun("bookingNo").disabled = true;
-                    this.columnforfun("refno").disabled = true;
-                    this.columnforfun("teamName").disabled = true;
-                    this.generateBillsfalse = true;
+                    // this.columnforfun('refno').disabled = true
                 }
                 if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, "rmbAmount", item.amount);
@@ -3056,11 +3027,10 @@ export default {
                 if (item.accStatus == 1) {
                     this.generateBillsfalse = true;
                     this.columnforfun("corpCnName").disabled = true;
-                    this.columnforfun("srcType").disabled = true;
+                    // this.columnforfun('srcType').disabled = true
                     this.columnforfun("mblno").disabled = true;
                     this.columnforfun("bookingNo").disabled = true;
-                    this.columnforfun("refno").disabled = true;
-                    this.columnforfun("teamName").disabled = true;
+                    // this.columnforfun('refno').disabled = true
                 }
                 if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, "rmbAmount", item.amount);
@@ -3089,22 +3059,21 @@ export default {
         handleClick(tba, event) { },
         // 大tbas切换
         bigHandleClick() {
-            if (this.bigtabs == 'fd') {
+            if (this.bigtabs == "fd") {
                 if (this.form.id) {
-                    this.billsListAllfun(this.form.id)
+                    this.billsListAllfun(this.form.id);
                 }
             }
-            if (this.bigtabs == 'dz') {
+            if (this.bigtabs == "dz") {
                 if (this.form.id) {
                     this.$refs.documentCenter.reportslogListfun({
                         currentPage: 1,
                         pageSize: 10
-                    })
+                    });
                 }
-                this.getReportTypeByBigHandle('单证')
+                this.getReportTypeByBigHandle("单证");
             }
-            if (this.bigtabs == 'fy') this.getReportTypeByBigHandle('费用')
-
+            if (this.bigtabs == "fy") this.getReportTypeByBigHandle("费用");
         },
         getReportTypeByBigHandle(name) {
             return name;

+ 9 - 9
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -437,7 +437,7 @@
                             </span>
                             <el-date-picker v-model="assemblyForm.etd" clearable style="width: 100%" type="date"
                                 size="small"
-                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                 value-format="yyyy-MM-dd" :picker-options="etdPickerOptions" placeholder="请选择ETD日期"
                                 @change="handlePick">
                             </el-date-picker>
@@ -457,7 +457,7 @@
                                 </span>
                                 <search-query :datalist="vesselData" :selectValue="assemblyForm.vesselEnName"
                                     :filterable="true" :clearable="true" :remote="true" :allowCreate="true"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     :buttonIf="false" placeholder="请选择船名"
                                     :forParameter="{ key: 'id', label: 'enName', value: 'enName' }"
                                     @remoteMethod="remoteMethod($event, 'vessel')"
@@ -471,7 +471,7 @@
                                 </span>
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
                                     autocomplete="off"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     clearable placeholder="请输入航次"></el-input>
                             </el-form-item>
                         </div>
@@ -492,7 +492,7 @@
                             </span>
                             <search-query :datalist="carrierData" :selectValue="assemblyForm.carrierCnName"
                                 :filterable="true" :clearable="true" :remote="true" :joinData="true"
-                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                :disabled="detailData.seeDisabled || generateBillsfalse || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                 :buttonIf="false" placeholder="请选择船公司"
                                 :forParameter="{ key: 'id', short: 'shortName', label: 'cnName', value: 'cnName' }"
                                 @remoteMethod="remoteMethod($event, 'carrier')"
@@ -658,7 +658,7 @@
                                         :url="'/blade-user/userListAll?roleAlias=操作员&deptId=' + saberUserInfo.dept_pid.split(',')[0]"
                                         :filterable="true" dataName="realName"
                                         @selectChange="dicChange('operatorName', $event)"
-                                        :disabled="detailData.seeDisabled"></dic-select>
+                                        :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="11">
@@ -671,7 +671,7 @@
                                         :url="'/blade-user/userListAll?roleAlias=客服&deptId=' + saberUserInfo.dept_pid.split(',')[0]"
                                         :filterable="true" dataName="realName"
                                         @selectChange="dicChange('accDeptName', $event)"
-                                        :disabled="detailData.seeDisabled"></dic-select>
+                                        :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                         </div>
@@ -685,7 +685,7 @@
                                         label="deptName" url="/blade-system/dept/top-list" :filterable="true"
                                         :remote="true" dataName="deptName"
                                         @selectChange="dicChange('branchName', $event)"
-                                        :disabled=" detailData.seeDisabled||!(roleName.includes('admin')||roleName.includes('总部'))"></dic-select>
+                                        :disabled="detailData.seeDisabled || !(roleName.includes('admin') || roleName.includes('总部'))|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"></dic-select>
                                 </el-form-item>
                             </el-col>
                         </div>
@@ -728,7 +728,7 @@
                             </span>
                             <!--                            :disabled="detailData.seeDisabled || generateBillsfalse" :buttonIf="false"-->
                             <search-query :datalist="cyData" :selectValue="assemblyForm.cyCnName" :filterable="true"
-                                :clearable="true" :remote="true"
+                                :clearable="true" :remote="true"  :disabled="detailData.seeDisabled"
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
                                 @remoteMethod="remoteMethod($event, 'cy')" @corpChange="corpChange($event, 'cy')"
                                 @corpFocus="remoteMethod($event, 'cy')">
@@ -775,7 +775,7 @@
                                     @click="emailJump('cy')">POD场站</span>
                             </span>
                             <search-query :datalist="podCyData" :selectValue="assemblyForm.podCyCnName"
-                                :filterable="true" :clearable="true" :remote="true"
+                                :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled"
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择场站"
                                 @remoteMethod="remoteMethod($event, 'podCyCnName')"
                                 @corpChange="corpChange($event, 'podCyCnName')"

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

@@ -76,7 +76,7 @@
                     <el-button v-if="isFeeEditD" type="info" plain size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="isFeeEditD" type="primary" plain size="small"
+                    <el-button v-if="isFeeEditC" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                     <el-button v-if="isFeeEditD" type="primary" plain size="small"
                         :disabled="disabled || pleasereviewType" @click="allClick('发票申请', 'D')">发票申请</el-button>

+ 27 - 19
src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -19,7 +19,8 @@
                             <span style="color: #1e9fff">截单时间</span>
                         </span>
                         <el-date-picker v-model="assemblyForm.cyTrailerTime" type="date" style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"
+                            value-format="yyyy-MM-dd HH:mm" size="small"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
                             placeholder="请选择截单时间">
                         </el-date-picker>
                     </el-form-item>
@@ -30,7 +31,8 @@
                             <span style="color: #1e9fff">截港时间</span>
                         </span>
                         <el-date-picker v-model="assemblyForm.cyReturnTime" type="date" style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"
+                            value-format="yyyy-MM-dd HH:mm" size="small"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
                             placeholder="请选择截港时间">
                         </el-date-picker>
                     </el-form-item>
@@ -52,7 +54,8 @@
                             <span style="color: #1e9fff">订舱日期</span>
                         </span>
                         <el-date-picker v-model="assemblyForm.bookingDate" type="date" style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"
+                            value-format="yyyy-MM-dd HH:mm" size="small"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
                             placeholder="请选择截港时间">
                         </el-date-picker>
                     </el-form-item>
@@ -90,10 +93,11 @@
                             <span style="color: #1e9fff">航线</span>
                         </span>
                         <search-query :datalist="lineData" :selectValue="assemblyForm.lineCnName" :filterable="true"
-                            :clearable="true" :remote="true" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)" :buttonIf="false"
-                            :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }" placeholder="请选择航线"
-                            @remoteMethod="remoteMethod($event, 'line')" @corpChange="corpChange($event, 'line')"
-                            @corpFocus="remoteMethod($event, 'line')">
+                            :clearable="true" :remote="true"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                            :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                            placeholder="请选择航线" @remoteMethod="remoteMethod($event, 'line')"
+                            @corpChange="corpChange($event, 'line')" @corpFocus="remoteMethod($event, 'line')">
                         </search-query>
                     </el-form-item>
                 </el-col>
@@ -102,6 +106,7 @@
                         <el-row :gutter="10">
                             <el-col :span="10">
                                 <search-query :datalist="sourceTypeData" :selectValue="assemblyForm.srcType"
+                                    :disabled="detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                                     :filterable="true" :clearable="true" :remote="true" :buttonIf="false"
                                     placeholder="请选择业务来源" @corpChange="sourceCorp($event, 'srcType')">
                                 </search-query>
@@ -109,8 +114,8 @@
                             <el-col :span="13">
                                 <search-query :datalist="srcData" :selectValue="assemblyForm.srcCnName"
                                     :filterable="true" :clearable="true" :remote="true"
-                                    :disabled="!assemblyForm.srcType || detailData.seeDisabled" :buttonIf="false"
-                                    :forParameter="sourceforParameter" placeholder="请选择来源明细"
+                                    :disabled="!assemblyForm.srcType || detailData.seeDisabled || assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
+                                    :buttonIf="false" :forParameter="sourceforParameter" placeholder="请选择来源明细"
                                     @remoteMethod="sourceRemote($event, 'srcCnName')"
                                     @corpChange="sourceCorp($event, 'srcCnName')"
                                     @corpFocus="sourceRemote($event, 'srcCnName')">
@@ -136,7 +141,8 @@
                             <span style="color: #1e9fff">ETA</span>
                         </span>
                         <el-date-picker v-model="assemblyForm.eta" type="date" style="width: 100%;"
-                            value-format="yyyy-MM-dd HH:mm" size="small" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"
+                            value-format="yyyy-MM-dd HH:mm" size="small"
+                            :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)|| assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length || assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length"
                             placeholder="请选择时间">
                         </el-date-picker>
                     </el-form-item>
@@ -158,7 +164,7 @@
                         </span>
                         <div>
                             <el-input v-model="assemblyForm.polFreeBoxUseDays" size="small" :controls="false"
-                                style="width: 100%;" placeholder="请输入POL免箱使天数"></el-input>
+                                style="width: 100%;" placeholder="请输入POL免箱使天数" :disabled="detailData.seeDisabled"></el-input>
                         </div>
 
                     </el-form-item>
@@ -170,7 +176,7 @@
                         </span>
                         <div>
                             <el-input v-model="assemblyForm.podFreeBoxUseDays" size="small" :controls="false"
-                                style="width: 100%;" placeholder="请输入POD免箱使天数"></el-input>
+                                style="width: 100%;" placeholder="请输入POD免箱使天数" :disabled="detailData.seeDisabled"></el-input>
                         </div>
 
                     </el-form-item>
@@ -186,7 +192,8 @@
                                 url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=船代" :filterable="true"
                                 :remote="true" dataName="shortName"
                                 @selectChange="dicChange('shippingAgencyCname', $event)" :slotRight="true"
-                                rightLabel="code" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"></dic-select>
+                                rightLabel="code"
+                                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"></dic-select>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -197,7 +204,8 @@
                         </span>
                         <el-col :span="9">
                             <search-query :datalist="bookingAgentData" :selectValue="assemblyForm.bookingAgentCnName"
-                                :filterable="true" :clearable="true" :remote="true" :disabled="detailData.seeDisabled||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)"
+                                :filterable="true" :clearable="true" :remote="true"
+                                :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
                                 :buttonIf="false" placeholder="请选择订舱代理"
                                 :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                                 @remoteMethod="remoteMethod($event, 'bookingAgent')"
@@ -208,8 +216,8 @@
                         <el-col :span="14" :offset="1">
                             <el-input type="age" style="width: 100%;" v-model="assemblyForm.bookingAgentEnName"
                                 size="small" autocomplete="off"
-                                :disabled="detailData.seeDisabled || !assemblyForm.bookingAgentCnName||(assemblyForm.billType == 'MH'&&assemblyForm.masterBillNo>0)" clearable
-                                placeholder="订舱代理"></el-input>
+                                :disabled="detailData.seeDisabled || !assemblyForm.bookingAgentCnName || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                clearable placeholder="订舱代理"></el-input>
                         </el-col>
                     </el-form-item>
                 </el-col>
@@ -350,7 +358,7 @@
                             <span style="color: #1e9fff">舱位数</span>
                         </span>
                         <el-input v-model="assemblyForm.shippingSpaceNumber" size="small" :controls="false"
-                            style="width: 100%;" placeholder="请输入舱位数"></el-input>
+                            style="width: 100%;" placeholder="请输入舱位数" :disabled="detailData.seeDisabled"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
@@ -360,7 +368,7 @@
                         </span>
                         <div>
                             <el-input v-model="assemblyForm.weightLimit" size="small" :controls="false"
-                                style="width: 100%;" placeholder="请输入限制重量(吨)"></el-input>
+                                style="width: 100%;" placeholder="请输入限制重量(吨)" :disabled="detailData.seeDisabled"></el-input>
                         </div>
 
                     </el-form-item>
@@ -371,7 +379,7 @@
                             <span style="color: #1e9fff">限制舱位(T)</span>
                         </span>
                         <el-input v-model="assemblyForm.restrictedCabinSpace" size="small" placeholder="请输入限制舱位(T)"
-                            style="width: 100%;"></el-input>
+                            style="width: 100%;" :disabled="detailData.seeDisabled"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">

+ 17 - 18
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -86,7 +86,7 @@
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
-                    </el-dropdown-menu>0
+                    </el-dropdown-menu>
                 </el-dropdown>
             </div>
         </div>
@@ -114,7 +114,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"-->
@@ -125,7 +125,7 @@
                                                             :datalist="item[0].dicData"
                                                             :selectValue="form[item[0].prop]" :filterable="true"
                                                             :allowCreate="item[0].allowCreate || false" :remote="true"
-                                                            :disabled="detailData.seeDisabled || item[0].disabled"
+                                                            :disabled="detailData.seeDisabled || item[0].disabled|| form.feeCenterListD.filter(item=>item.auditStatus>0).length||form.feeCenterListC.filter(item=>item.auditStatus>0).length"
                                                             :buttonIf="false" :placeholder="`${item[0].text || ''}`"
                                                             :forParameter="item[0].forParameter"
                                                             @remoteMethod="remoteMethod($event, item[0].prop)"
@@ -134,7 +134,7 @@
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;"
                                                             v-model="form[item[0].prop]" size="small" autocomplete="off"
-                                                            :disabled="detailData.seeDisabled || item[0].disabled"
+                                                            :disabled="detailData.seeDisabled || item[0].disabled|| form.feeCenterListD.filter(item=>item.auditStatus>0).length||form.feeCenterListC.filter(item=>item.auditStatus>0).length"
                                                             :placeholder="item[0].text || ''"></el-input>
                                                     </el-form-item>
                                                 </el-col>
@@ -154,7 +154,7 @@
                                                             :datalist="item[1].dicData"
                                                             :selectValue="form[item[1].prop]" :filterable="true"
                                                             :remote="true"
-                                                            :disabled="detailData.seeDisabled || item[1].disabled"
+                                                            :disabled="detailData.seeDisabled || item[1].disabled|| form.feeCenterListD.filter(item=>item.auditStatus>0).length||form.feeCenterListC.filter(item=>item.auditStatus>0).length"
                                                             :buttonIf="false" :placeholder="`${item[1].text || ''}`"
                                                             :forParameter="item[1].forParameter"
                                                             @remoteMethod="remoteMethod($event, item[1].prop)"
@@ -212,7 +212,7 @@
                                                 <search-query v-if="item.type == 'select'" ref="searchQueryRef"
                                                     :datalist="item.dicData" :selectValue="form[item.prop]"
                                                     :filterable="true" :clearable="false" :remote="true"
-                                                    :disabled="detailData.seeDisabled || item.disabled"
+                                                    :disabled="detailData.seeDisabled|| form.feeCenterListD.filter(item=>item.auditStatus>0).length||form.feeCenterListC.filter(item=>item.auditStatus>0).length"
                                                     :buttonIf="item.buttonIf" :forParameter="item.forParameter"
                                                     :placeholder="`${item.text || ''}`" :joinData="item.joinData"
                                                     @remoteMethod="remoteMethod($event, item.prop)"
@@ -2461,6 +2461,7 @@ export default {
                 }
                 item.edit = false
             }
+            console.log(this.form.feeCenterListD)
             // 文件中心
             for (let item of this.form.filesList) {
                 this.$set(item, 'edit', false)
@@ -2478,11 +2479,11 @@ export default {
 
             this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
             // 如果已经请核就禁用按钮
-            // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
-            //     this.detailData.seeDisabled = true
-            // }else {
-            //     this.detailData.seeDisabled = false
-            // }
+            if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
+                this.detailData.seeDisabled = true
+            }else {
+                this.detailData.seeDisabled = false
+            }
             // this.columnforfun('teamName').disabled = true
 
             // this.columnforfun('operatorName').disabled = true
@@ -2528,13 +2529,12 @@ export default {
             for (let item of this.form.feeCenterListD) {
                 // 判断是否生成了账单
                 if (item.accStatus == 1) {
+                    this.generateBillsfalse = true
                     this.columnforfun('corpCnName').disabled = true
-                    this.columnforfun('srcType').disabled = true
+                    // this.columnforfun('srcType').disabled = true
                     this.columnforfun('mblno').disabled = true
                     this.columnforfun('bookingNo').disabled = true
-                    this.columnforfun('refno').disabled = true
-                    this.columnforfun('teamName').disabled = true
-                    this.generateBillsfalse = true
+                    // this.columnforfun('refno').disabled = true
                 }
                 if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', item.amount)
@@ -2555,11 +2555,10 @@ export default {
                 if (item.accStatus == 1) {
                     this.generateBillsfalse = true
                     this.columnforfun('corpCnName').disabled = true
-                    this.columnforfun('srcType').disabled = true
+                    // this.columnforfun('srcType').disabled = true
                     this.columnforfun('mblno').disabled = true
                     this.columnforfun('bookingNo').disabled = true
-                    this.columnforfun('refno').disabled = true
-                    this.columnforfun('teamName').disabled = true
+                    // this.columnforfun('refno').disabled = true
                 }
                 if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', item.amount)

+ 4 - 1
src/views/iosBasicData/SeafreightExportF/bills/index.vue

@@ -150,7 +150,7 @@
                 <template slot="eta" slot-scope="scope">
                     <span>{{
                         scope.row.eta ? scope.row.eta.slice(0, 10) : ""
-                    }}</span>
+                        }}</span>
                 </template>
                 <template slot="updateTime" slot-scope="scope">
                     <span>{{
@@ -1584,6 +1584,9 @@ export default {
             let obj = {}
             let billsIds = []
             for (let item of this.selectionList) {
+                if (item.status == 3) {
+                    return this.$message.error("单据已提交审核,请重新选择");
+                }
                 if (item.polId) podId.push(item.polId)
                 if (item.podId) destinationId.push(item.podId)
                 if (item.lineId) airlineId.push(item.lineId)

+ 9 - 1
src/views/iosBasicData/feeApplication/detailsPage.vue

@@ -136,7 +136,8 @@
             </div> -->
       </trade-card>
     </div>
-    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="FYSQ" :classifyCode="form.srcType" :type="true"></business-reports>
+    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="FYSQ" :classifyCode="form.srcType"
+      :type="true"></business-reports>
     <reports :id="form.id" :assemblyForm="form" businessValue="FYSQ" ref="report"></reports>
   </div>
 </template>
@@ -230,6 +231,13 @@ export default {
           {
             label: '来源类型',
             prop: 'srcType',
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=srcType",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             disabled: true
           },
           {

+ 7 - 0
src/views/iosBasicData/feeApplication/index.vue

@@ -115,6 +115,13 @@ export default {
             prop: 'srcType',
             width: 120,
             overHidden: true,
+            type: "select",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=srcType",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             search: true,
           },
           {

+ 3 - 2
src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -83,8 +83,8 @@
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
-                        <el-button type="text" size="small" :disabled="basicData.disabled"
-                            @click="feestemplateCompanyEdit(index, row)">详情</el-button>
+                        <!-- <el-button type="text" size="small" :disabled="basicData.disabled"
+                            @click="feestemplateCompanyEdit(index, row)">详情</el-button> -->
                         <el-button size="small" type="text" :disabled="basicData.disabled" @click="rowCell(row, index)">
                             {{ row.$cellEdit ? '保存' : '编辑' }}
                         </el-button>
@@ -654,6 +654,7 @@ export default {
     created() {
         if (this.detailData.businessTypeId) {
             this.form = {
+                status:0,
                 businessTypeId: this.detailData.businessTypeId,
                 businessTypeCnName: this.detailData.businessTypeCnName,
                 businessTypeEnName: this.detailData.businessTypeEnName,

+ 75 - 43
src/views/iosBasicData/seamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,25 +34,33 @@
                     <el-row>
                         <el-col :span="5">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
+                            <el-form-item label="制单日期" prop="createTime">
+                                <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择制单日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <!-- <el-col :span="5">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
                         <el-col :span="5">
                             <el-form-item label="BOOKINGNO" prop="bookingNo">
                                 <el-input style="width: 100%;" v-model="form.bookingNo" :disabled="buttonDisable"
@@ -72,23 +81,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -100,18 +110,18 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="制单日期" prop="createTime">
-                                <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择制单日期">
-                                </el-date-picker>
+                            <el-form-item label="所属公司" prop="branchName">
+                                <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
+                                    url="/blade-system/dept/top-list" :filterable="true" :remote="true"
+                                    dataName="deptName" @selectChange="dicChange('branchName', $event)"
+                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +162,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -216,8 +226,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -230,8 +241,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -244,8 +256,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -275,7 +287,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -287,8 +300,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -322,10 +335,12 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import { contrastObj, contrastList } from "@/util/contrastData";
+import dicSelect from "@/components/dicSelect/main";
 export default {
-    components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
+    components: { dicSelect, reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
         return {
+            roleName: localStorage.getItem("roleName"),
             retrievePopupsType: false, // 检索完的弹窗
             retrievePopupsData: [], // 检索完的弹窗数据
             retrievePopupsOption: {
@@ -416,12 +431,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -541,6 +560,17 @@ export default {
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'branchName') {
+                if (row) {
+                    this.form.branchId = row.id
+                    this.saveLocalCurrency(row.id)
+                } else {
+                    this.form.branchId = null
+                    this.form.branchName = null
+                }
+            }
+        },
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
@@ -682,6 +712,7 @@ export default {
             this.pageLoading = true
             amendsDetail(id).then(res => {
                 this.pageLoading = false
+                this.saveLocalCurrency(res.data.data.branchId)
                 this.form = res.data.data
                 this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑状态
@@ -692,7 +723,7 @@ export default {
                 let arr = ['feeCenterList', 'feeCenterListC', 'feeCenterListD']
                 for (let data of arr) {
                     for (let item of this.form[data]) {
-                        if (item.curCode == 'CNY') {
+                        if (item.curCode ==this.getLocalCurrency()) {
                             this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
                             this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -989,7 +1020,7 @@ export default {
             // })
             // 应收
             for (let item of this.form.feeCenterListD) {
-                if (item.curCode == 'CNY') {
+                if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
                     this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -1003,7 +1034,7 @@ export default {
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
-                if (item.curCode == 'CNY') {
+                if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
                     this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -1034,9 +1065,9 @@ export default {
                 if (!item.feeId) {
                     sum += ` 应收序号${item.$index + 1}费用简称`
                 }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
+                // if (!item.elementsId) {
+                //     sum += ` 应收序号${item.$index + 1}核算要素`
+                // }
                 if (!item.curCode) {
                     sum += ` 应收序号${item.$index + 1}币种`
                 }
@@ -1489,7 +1520,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

File diff suppressed because it is too large
+ 743 - 838
src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue


+ 4 - 4
src/views/iosBasicData/seamends/assembly/billgenerated.vue

@@ -36,11 +36,11 @@
             <el-table-column label="汇率" prop="exrate" width="100px" />
             <el-table-column label="单价" prop="price" width="120px" />
             <el-table-column label="数量" prop="quantity" width="120px" />
-            <el-table-column label="CNY(含税)" prop="rmbAmount" width="100px" />
-            <el-table-column label="USD(含税)" prop="usdAmount" width="100px" />
-            <el-table-column label="CNY(净额)" prop="rmbAmountNet" width="100px" />
+            <el-table-column label="本币" prop="rmbAmount" width="100px" />
+            <el-table-column label="外币" prop="usdAmount" width="100px" />
+            <!-- <el-table-column label="CNY(净额)" prop="rmbAmountNet" width="100px" />
             <el-table-column label="USD(净额)" prop="rmbAmountNet" width="100px" />
-            <el-table-column label="核算要素" prop="elementsCnName" width="120px" />
+            <el-table-column label="核算要素" prop="elementsCnName" width="120px" /> -->
             <el-table-column label="付费申请金额" prop="appliedAmount" width="120px" />
             <el-table-column label="发票申请金额" prop="appliedInvoiceAmount" width="120px" />
             <el-table-column label="已开票金额" prop="uninvoicedAmount" width="120px" />

+ 71 - 41
src/views/iosBasicData/siamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,15 +34,15 @@
                     <el-row>
                         <el-col :span="5">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -58,23 +59,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -88,16 +90,16 @@
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择制单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择制单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -130,6 +132,14 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
+                            <el-form-item label="所属公司" prop="branchName">
+                                <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
+                                    url="/blade-system/dept/top-list" :filterable="true" :remote="true"
+                                    dataName="deptName" @selectChange="dicChange('branchName', $event)"
+                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
                             <el-form-item label="件数" prop="quantity">
                                 <el-input style="width: 100%;" v-model="form.quantity" size="small" autocomplete="off"
                                     :disabled="true" clearable placeholder="件数">
@@ -138,26 +148,26 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="9">
+                        <el-col :span="7">
                             <el-form-item label="箱型箱量" prop="quantityCntrDescr">
                                 <el-input style="width: 100%;" v-model="form.quantityCntrDescr" size="small"
                                     autocomplete="off" :disabled="true" clearable placeholder="箱型箱量">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="10">
+                        <el-col :span="7">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
                                     autocomplete="off" :disabled="true" clearable placeholder="原业务备注">
@@ -202,8 +212,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -216,8 +227,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -230,8 +242,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -262,7 +274,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -274,8 +287,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -308,9 +321,9 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { contrastObj, contrastList } from "@/util/contrastData";
-
+import dicSelect from "@/components/dicSelect/main";
 export default {
-    components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
+    components: { dicSelect, reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
         return {
             retrievePopupsType: false, // 检索完的弹窗
@@ -398,12 +411,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -522,6 +539,17 @@ export default {
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'branchName') {
+                if (row) {
+                    this.form.branchId = row.id
+                    this.saveLocalCurrency(row.id)
+                } else {
+                    this.form.branchId = null
+                    this.form.branchName = null
+                }
+            }
+        },
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
@@ -580,7 +608,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -661,6 +689,7 @@ export default {
             this.pageLoading = true
             amendsDetail(id).then(res => {
                 this.pageLoading = false
+                this.saveLocalCurrency(res.data.data.branchId)
                 this.form = res.data.data
                 this.oldForm = this.deepClone(res.data.data);
                 // 把编辑状态变成不可编辑
@@ -671,7 +700,7 @@ export default {
                 let arr = ['feeCenterList', 'feeCenterListC', 'feeCenterListD']
                 for (let data of arr) {
                     for (let item of this.form[data]) {
-                        if (item.curCode == 'CNY') {
+                        if (item.curCode == this.getLocalCurrency()) {
                             this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                             this.$set(item, 'usdAmount', '')
                             this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -966,7 +995,7 @@ export default {
             // })
             // 应收
             for (let item of this.form.feeCenterListD) {
-                if (item.curCode == 'CNY') {
+                if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
                     this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -980,7 +1009,7 @@ export default {
             }
             // 应付
             for (let item of this.form.feeCenterListC) {
-                if (item.curCode == 'CNY') {
+                if (item.curCode == this.getLocalCurrency()) {
                     this.$set(item, 'rmbAmount', Number(item.amount).toFixed(2))
                     this.$set(item, 'usdAmount', '')
                     this.$set(item, 'rmbAmountNet', Number(item.amountNet).toFixed(2))
@@ -1011,9 +1040,9 @@ export default {
                 if (!item.feeId) {
                     sum += ` 应收序号${item.$index + 1}费用简称`
                 }
-                if (!item.elementsId) {
-                    sum += ` 应收序号${item.$index + 1}核算要素`
-                }
+                // if (!item.elementsId) {
+                //     sum += ` 应收序号${item.$index + 1}核算要素`
+                // }
                 if (!item.curCode) {
                     sum += ` 应收序号${item.$index + 1}币种`
                 }
@@ -1461,7 +1490,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

File diff suppressed because it is too large
+ 740 - 830
src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue


+ 135 - 143
src/views/iosBasicData/siamends/assembly/billgenerated.vue

@@ -1,31 +1,23 @@
 <template>
     <div>
-        <el-table
-            ref="tableRef"
-            :cell-style="{padding:'0px',fontSize:'12px'}"
-            :header-cell-style="tableHeaderCellStyle"
-            :data="tableData"
-            border
-            style="width: 100%"
-            @selection-change="handleSelectionChange"
-            @row-click="rowClick"
-            :row-style="rowStyle"
-            :row-class-name="rowClassName" >
+        <el-table ref="tableRef" :cell-style="{ padding: '0px', fontSize: '12px' }" :header-cell-style="tableHeaderCellStyle"
+            :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" @row-click="rowClick"
+            :row-style="rowStyle" :row-class-name="rowClassName">
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="sort" label="行号" width="50px" >
+            <el-table-column prop="sort" label="行号" width="50px">
                 <template slot-scope="scope">
-                    <span>{{Number(scope.$index) + 1}}</span>
+                    <span>{{ Number(scope.$index) + 1 }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="账单" prop="accStatus" width="60px" >
+            <el-table-column label="账单" prop="accStatus" width="60px">
                 <template slot-scope="{ row }">
-                    <span>{{row.accStatus?'是':'否'}}</span>
+                    <span>{{ row.accStatus ? '是' : '否' }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="往来单位" prop="corpCnName" width="160px" >
+            <el-table-column label="往来单位" prop="corpCnName" width="160px">
                 <template slot-scope="{ row }">
                     <el-tooltip class="item" effect="dark" :content="row.corpCnName" placement="top">
-                        <span class="textHide">{{row.corpCnName}}</span>
+                        <span class="textHide">{{ row.corpCnName }}</span>
                     </el-tooltip>
                 </template>
             </el-table-column>
@@ -46,9 +38,9 @@
             <el-table-column label="已开票金额" prop="uninvoicedAmount" width="120px" />
             <el-table-column label="已结算金额" prop="stlTtlAmount" width="120px" />
             <el-table-column label="备注" prop="remarks" width="100px" />
-            <el-table-column label="单价是否含税" prop="isTax" width="120px" >
+            <el-table-column label="单价是否含税" prop="isTax" width="120px">
                 <template slot-scope="{row}">
-                    <span>{{row.isTax?'是':'否'}}</span>
+                    <span>{{ row.isTax ? '是' : '否' }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -56,140 +48,140 @@
 </template>
 
 <script>
-    export default {
-        props:{
-            tableData:{
-                type:Array,
-                default:[]
-            },
-            handleSelectionData:{
-                type:Array,
-                default: []
-            }
+export default {
+    props: {
+        tableData: {
+            type: Array,
+            default: []
         },
-        data(){
-            return {
+        handleSelectionData: {
+            type: Array,
+            default: []
+        }
+    },
+    data() {
+        return {
 
-            }
+        }
+    },
+    methods: {
+        // 表头样式
+        tableHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
+            return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
         },
-        methods:{
-            // 表头样式
-            tableHeaderCellStyle({row,column,rowIndex, columnIndex}){
-                return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
-            },
-            // 列表多选
-            // 多选选择的数据
-            handleSelectionChange(arr){
-                this.$emit('handleSelectionChange',arr)
-            },
-            // 监听点击表格事件
-            rowClick(row, column, event) {
-                let refsElTable = this.$refs.tableRef; // 获取表格对象
-                if (this.CtrlDown) {
-                    refsElTable.toggleRowSelection(row); // ctrl多选 如果点击两次同样会取消选中
-                    return;
-                }
-                if ( this.shiftOrAltDown && this.handleSelectionData.length > 0) {
-                    // 通过rowIndex判断已选择的行中最上面和最下面的是哪行,再对比按住shift/alt点击的当前行得到新的最上面和最下面的行,把这两行中间的行进行循环选中。
-                    let topAndBottom = this.getTopAndBottom(  row, this.bottomSelectionRow, this.topSelectionRow );
-                    refsElTable.clearSelection(); //先清空 不然会导致在这两行中间之外的行状态不变
-                    for (let index = topAndBottom.top; index <= topAndBottom.bottom; index++) { //选中两行之间的所有行
-                        refsElTable.toggleRowSelection(this.tableData[index], true);
-                    }
-                } else {
-                    let findRow = this.handleSelectionData.find(c => c.rowIndex == row.rowIndex); //找出当前选中行
-                    //如果只有一行且点击的也是这一行则取消选择 否则清空再选中当前点击行
-                    if (findRow&& this.handleSelectionData.length === 1 ) {
-                        refsElTable.toggleRowSelection(row, false);
-                        return;
-                    }
-                    // refsElTable.clearSelection(); // 清空之前选择的数据(如果放开,选择之前会变成单选)
-                    refsElTable.toggleRowSelection(row); // 调用选中行方法
-                }
-            },
-            // 行的 style 的回调方法
-            rowStyle({row,rowIndex}) {
-                // 直接在一个对象上定义一个新属性,或者修改一个对象的现有属性,并返回此对象
-                // object: 要添加或者修改属性的目标对象;prop: 要定义或修改属性的名称;descript: 是一个对象,里面是我们上述的对象属性的特性;
-                Object.defineProperty(row, 'rowIndex', { //给每一行添加不可枚举属性rowIndex来标识当前行
-                    value: rowIndex, // 设置age的值,不设置的话默认为undefined
-                    writable: true, // 表示属性的值true可以修改,false不可以被修改
-                    enumerable: false, // 设置为false表示不能通过 for-in 循环返回
-                    // configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
-                })
-            },
-            keyDown(event) {
-                let key = event.keyCode;
-                if (key == 17) this.CtrlDown = true;
-                if (key == 16 || key == 18) this.shiftOrAltDown = true;
-            },
-            keyUp(event) {
-                let key = event.keyCode;
-                if (key == 17) this.CtrlDown = false;
-                if (key == 16 || key == 18) this.shiftOrAltDown = false;
-            },
-            // 文章说明 https://www.jianshu.com/p/48f2c522d2a2
-            getTopAndBottom(row, bottom, top){
-                let n = row.rowIndex,
-                    mx = bottom.rowIndex,
-                    mi = top.rowIndex;
-                if (n > mx) {
-                    return {
-                        top: mi,
-                        bottom: n
-                    };
-                } else if (n < mx && n > mi) {
-                    return {
-                        top: mi,
-                        bottom: n
-                    };
-                } else if (n < mi) {
-                    return {
-                        top: n,
-                        bottom: mx
-                    };
-                } else if (n == mi || n == mx) {
-                    return {
-                        top: mi,
-                        bottom: mx
-                    };
+        // 列表多选
+        // 多选选择的数据
+        handleSelectionChange(arr) {
+            this.$emit('handleSelectionChange', arr)
+        },
+        // 监听点击表格事件
+        rowClick(row, column, event) {
+            let refsElTable = this.$refs.tableRef; // 获取表格对象
+            if (this.CtrlDown) {
+                refsElTable.toggleRowSelection(row); // ctrl多选 如果点击两次同样会取消选中
+                return;
+            }
+            if (this.shiftOrAltDown && this.handleSelectionData.length > 0) {
+                // 通过rowIndex判断已选择的行中最上面和最下面的是哪行,再对比按住shift/alt点击的当前行得到新的最上面和最下面的行,把这两行中间的行进行循环选中。
+                let topAndBottom = this.getTopAndBottom(row, this.bottomSelectionRow, this.topSelectionRow);
+                refsElTable.clearSelection(); //先清空 不然会导致在这两行中间之外的行状态不变
+                for (let index = topAndBottom.top; index <= topAndBottom.bottom; index++) { //选中两行之间的所有行
+                    refsElTable.toggleRowSelection(this.tableData[index], true);
                 }
-            },
-            // 给选中行加上current-row这个class类,所以要使用row-class-name这个属性(其实给每一行添加rowIndex也可以用这个属性),
-            // 判断方式也是通过判断rowIndex对比
-            rowClassName({ row,  rowIndex }) {
-                let rowName = "",
-                    findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
-                if (findRow) {
-                    rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
+            } else {
+                let findRow = this.handleSelectionData.find(c => c.rowIndex == row.rowIndex); //找出当前选中行
+                //如果只有一行且点击的也是这一行则取消选择 否则清空再选中当前点击行
+                if (findRow && this.handleSelectionData.length === 1) {
+                    refsElTable.toggleRowSelection(row, false);
+                    return;
                 }
-                return rowName; //也可以再加上其他类名 如果有需求的话
-            },
+                // refsElTable.clearSelection(); // 清空之前选择的数据(如果放开,选择之前会变成单选)
+                refsElTable.toggleRowSelection(row); // 调用选中行方法
+            }
         },
-        mounted() {
-            // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件,
-            addEventListener("keydown", this.keyDown, false);
-            addEventListener("keyup", this.keyUp, false);
+        // 行的 style 的回调方法
+        rowStyle({ row, rowIndex }) {
+            // 直接在一个对象上定义一个新属性,或者修改一个对象的现有属性,并返回此对象
+            // object: 要添加或者修改属性的目标对象;prop: 要定义或修改属性的名称;descript: 是一个对象,里面是我们上述的对象属性的特性;
+            Object.defineProperty(row, 'rowIndex', { //给每一行添加不可枚举属性rowIndex来标识当前行
+                value: rowIndex, // 设置age的值,不设置的话默认为undefined
+                writable: true, // 表示属性的值true可以修改,false不可以被修改
+                enumerable: false, // 设置为false表示不能通过 for-in 循环返回
+                // configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
+            })
         },
-        beforeDestroy() { //解绑
-            removeEventListener("keydown", this.keyDown);
-            removeEventListener("keyup", this.keyUp);
+        keyDown(event) {
+            let key = event.keyCode;
+            if (key == 17) this.CtrlDown = true;
+            if (key == 16 || key == 18) this.shiftOrAltDown = true;
         },
-        computed: { //实时得到最上行和最下行
-            bottomSelectionRow() {
-                if (this.handleSelectionData.length == 0) return null;
-                return this.handleSelectionData.reduce((start, end) => {
-                    return start.rowIndex > end.rowIndex ? start : end;
-                });
-            },
-            topSelectionRow() {
-                if (this.handleSelectionData.length == 0) return null;
-                return this.handleSelectionData.reduce((start, end) => {
-                    return start.rowIndex < end.rowIndex ? start : end;
-                });
+        keyUp(event) {
+            let key = event.keyCode;
+            if (key == 17) this.CtrlDown = false;
+            if (key == 16 || key == 18) this.shiftOrAltDown = false;
+        },
+        // 文章说明 https://www.jianshu.com/p/48f2c522d2a2
+        getTopAndBottom(row, bottom, top) {
+            let n = row.rowIndex,
+                mx = bottom.rowIndex,
+                mi = top.rowIndex;
+            if (n > mx) {
+                return {
+                    top: mi,
+                    bottom: n
+                };
+            } else if (n < mx && n > mi) {
+                return {
+                    top: mi,
+                    bottom: n
+                };
+            } else if (n < mi) {
+                return {
+                    top: n,
+                    bottom: mx
+                };
+            } else if (n == mi || n == mx) {
+                return {
+                    top: mi,
+                    bottom: mx
+                };
             }
         },
-    }
+        // 给选中行加上current-row这个class类,所以要使用row-class-name这个属性(其实给每一行添加rowIndex也可以用这个属性),
+        // 判断方式也是通过判断rowIndex对比
+        rowClassName({ row, rowIndex }) {
+            let rowName = "",
+                findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
+            if (findRow) {
+                rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
+            }
+            return rowName; //也可以再加上其他类名 如果有需求的话
+        },
+    },
+    mounted() {
+        // 按住ctrl实现多选 设置监听keydown事件,以及keyup事件,
+        addEventListener("keydown", this.keyDown, false);
+        addEventListener("keyup", this.keyUp, false);
+    },
+    beforeDestroy() { //解绑
+        removeEventListener("keydown", this.keyDown);
+        removeEventListener("keyup", this.keyUp);
+    },
+    computed: { //实时得到最上行和最下行
+        bottomSelectionRow() {
+            if (this.handleSelectionData.length == 0) return null;
+            return this.handleSelectionData.reduce((start, end) => {
+                return start.rowIndex > end.rowIndex ? start : end;
+            });
+        },
+        topSelectionRow() {
+            if (this.handleSelectionData.length == 0) return null;
+            return this.handleSelectionData.reduce((start, end) => {
+                return start.rowIndex < end.rowIndex ? start : end;
+            });
+        }
+    },
+}
 </script>
 
 <style scoped>

+ 13 - 2
src/views/ow/owPut/detailsPage.vue

@@ -302,6 +302,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <el-card
@@ -395,6 +400,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud4"
@@ -1623,7 +1633,7 @@ export default {
         {
           label: "备注",
           prop: "remarks",
-          cell: true,
+          width: "120",
           overHidden: true
         }
         ]
@@ -1852,7 +1862,8 @@ export default {
         {
           label: "备注",
           prop: "remarks",
-          cell: true,
+
+          width: "120",
           overHidden: true
         }
         ]

+ 22 - 10
src/views/ow/owTask/detailsPage.vue

@@ -305,6 +305,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <el-card
@@ -398,6 +403,11 @@
                   :precision="0" @change="countChange(row)"></el-input-number>
                 <span v-else>{{ row.quantity }}</span>
               </template>
+              <template slot="remarks" slot-scope="{ row }">
+                <el-input v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                  v-model="row.remarks" placeholder="请输入 备注" size="small" style="width: 100%;"></el-input>
+                <span v-else>{{ row.remarks }}</span>
+              </template>
             </avue-crud>
           </el-card>
           <avue-crud id="out-table" class="box-card" :header-cell-class-name="headerClassName" ref="crud4"
@@ -1631,7 +1641,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            width: "120",
+            // cell: true,
             overHidden: true
           }
         ]
@@ -1839,7 +1850,8 @@ export default {
           {
             label: "备注",
             prop: "remarks",
-            cell: true,
+            width: "120",
+            // cell: true,
             overHidden: true
           }
         ]
@@ -2015,20 +2027,20 @@ export default {
         sumArr.forEach(item => {
           if (e == item.shortName) {
             if (item.curCode == this.getLocalCurrency() && item.dc == 'D') {
-              rmbD += Number(item.amount?item.amount:0)
-              sumD += Number(item.amount?item.amount:0)
+              rmbD += Number(item.amount ? item.amount : 0)
+              sumD += Number(item.amount ? item.amount : 0)
             }
             if (item.curCode == this.getLocalCurrency() && item.dc == 'C') {
-              rmbC += Number(item.amount?item.amount:0)
-              sumC += Number(item.amount?item.amount:0)
+              rmbC += Number(item.amount ? item.amount : 0)
+              sumC += Number(item.amount ? item.amount : 0)
             }
             if (item.curCode == this.getLocalCurrency() && item.dc == 'D') {
-              usdD += Number(item.amountLoc?item.amountLoc:0)
-              sumD += Number(item.amountLoc?item.amountLoc:0) * Number(item.exrate?item.exrate:0)
+              usdD += Number(item.amountLoc ? item.amountLoc : 0)
+              sumD += Number(item.amountLoc ? item.amountLoc : 0) * Number(item.exrate ? item.exrate : 0)
             }
             if (item.curCode == this.getLocalCurrency() && item.dc == 'C') {
-              usdC += Number(item.amountLoc?item.amountLoc:0)
-              sumC += Number(item.amountLoc?item.amountLoc:0) * Number(item.exrate?item.exrate:0)
+              usdC += Number(item.amountLoc ? item.amountLoc : 0)
+              sumC += Number(item.amountLoc ? item.amountLoc : 0) * Number(item.exrate ? item.exrate : 0)
             }
           }
         })

+ 4 - 4
src/views/system/user.vue

@@ -783,10 +783,10 @@
       ...mapGetters(["userInfo", "permission"]),
       permissionList() {
         return {
-          addBtn: this.roleName.includes('admin')?this.vaildData(this.permission.user_add, false):false,
+          addBtn: this.roleName.includes('admin')||this.roleName.includes('secondaryAdmin')?this.vaildData(this.permission.user_add, false):false,
           viewBtn: this.vaildData(this.permission.user_view, false),
-          delBtn: this.roleName.includes('admin')?this.vaildData(this.permission.user_delete, false):false,
-          editBtn: this.roleName.includes('admin')?this.vaildData(this.permission.user_edit, false):false
+          delBtn: this.roleName.includes('admin')||this.roleName.includes('secondaryAdmin')?this.vaildData(this.permission.user_delete, false):false,
+          editBtn: this.roleName.includes('admin')||this.roleName.includes('secondaryAdmin')?this.vaildData(this.permission.user_edit, false):false
         };
       },
       platformPermissionList() {
@@ -823,7 +823,7 @@
                           // 判断是不是积分余额
                           if (ite.prop == "pointsBalance") {
                               // 判断是否是admin 权限
-                              if (arr.indexOf('admin') != -1) {
+                              if (arr.indexOf('admin') != -1||arr.indexOf('secondaryAdmin') != -1) {
                                   ite.disabled = false
                               }
                               ite.addDisplay = true

Some files were not shown because too many files changed in this diff