海运进口 放开汇率编辑 调整编辑宽度

src/components/feeModify/main.vue

@@ -45,7 +45,7 @@
               :filterable="true" :mockData="unitNoData" :disabled="newOption.disabled"
               @selectChange="dicChange('unitNoUpdate', $event)" @visibleChange="visibleChange"></dic-select> -->
             <el-select v-model="newForm.unitNoUpdate" placeholder="请选择 计量单位" size="small"
-              @visible-change="visibleChange" @change="dicChange('unitNoUpdate', $event)" :disabled="newOption.disabled"></el-select>
+              @visible-change="visibleChange" @change="dicChange('unitNoUpdate', $event)" :disabled="newOption.disabled">
               <el-option v-for="item in unitNoData" :key="item.code" :label="item.code" :value="item.code">
               </el-option>
             </el-select>

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

@@ -100,10 +100,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              !selectionDList.length ||
-                disabled ||
-                isFeedDisabled "
+            :disabled="!selectionDList.length || disabled || isFeedDisabled"
             @click="batchDelete('D')"
           >
             {{ $t("btn118n.deleted") }}
@@ -142,10 +139,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionDList.length == 0 ||
-               isFeedDisabled"
+            :disabled="disabled || selectionDList.length == 0 || isFeedDisabled"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -153,10 +147,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionDList.length == 0 ||
-               isFeedDisabled "
+            :disabled="disabled || selectionDList.length == 0 || isFeedDisabled"
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -164,10 +155,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-                isFeedDisabled "
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -175,10 +163,7 @@
             type="success"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-                isFeedDisabled"
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -186,10 +171,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-               isFeedDisabled "
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -344,6 +326,18 @@
           </search-query>
           <span v-else>{{ row.curCode }}</span>
         </template>
+        <template slot="exrate" slot-scope="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.exrate"
+            size="small"
+            :controls="false"
+            :precision="5"
+            placeholder="请输入"
+            style="width: 100%;"
+          ></el-input-number>
+          <span v-else>{{ row.exrate }}</span>
+        </template>
         <template slot="isTax" slot-scope="{ row }">
           <span>{{ row.isTax ? "是" : "否" }}</span>
         </template>
@@ -428,10 +422,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              !selectionCList.length ||
-                disabled ||
-              isFeecDisabled "
+            :disabled="!selectionCList.length || disabled || isFeecDisabled"
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -469,10 +460,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionCList.length == 0 ||
-                isFeecDisabled"
+            :disabled="disabled || selectionCList.length == 0 || isFeecDisabled"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -480,10 +468,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionCList.length == 0 ||
-                isFeecDisabled"
+            :disabled="disabled || selectionCList.length == 0 || isFeecDisabled"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -493,10 +478,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                isFeecDisabled"
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -504,10 +486,7 @@
             type="success"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                isFeecDisabled"
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -515,10 +494,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                isFeecDisabled"
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -656,6 +632,18 @@
           </search-query>
           <span v-else>{{ row.curCode }}</span>
         </template>
+        <template slot="exrate" slot-scope="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.exrate"
+            size="small"
+            :controls="false"
+            :precision="5"
+            placeholder="请输入"
+            style="width: 100%;"
+          ></el-input-number>
+          <span v-else>{{ row.exrate }}</span>
+        </template>
         <template slot="isTax" slot-scope="{ row }">
           <span>{{ row.isTax ? "是" : "否" }}</span>
         </template>
@@ -1547,7 +1535,7 @@ export default {
           {
             label: this.$t("sea118n.exrate"),
             prop: "exrate",
-            width: "60",
+            width: "100",
             overHidden: true
           },
           {
@@ -1773,7 +1761,7 @@ export default {
           {
             label: this.$t("sea118n.exrate"),
             prop: "exrate",
-            width: "60",
+            width: "100",
             overHidden: true
           },
           {
@@ -2181,7 +2169,7 @@ export default {
       }
     });
   },
-   computed: {
+  computed: {
     //监听 收费是否允许他人编辑
     isFeedDisabled() {
       if (this.assemblyForm.id && this.selectionDList.filter(e => e.id && e.createUser != this.userId).length > 0) {

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

@@ -1532,7 +1532,7 @@ export default {
           {
             label: this.$t("sea118n.exrate"),
             prop: "exrate",
-            width: "60",
+            width: "100",
             overHidden: true
           },
           {
@@ -1773,7 +1773,7 @@ export default {
           {
             label: this.$t("sea118n.exrate"),
             prop: "exrate",
-            width: "60",
+            width: "100",
             overHidden: true
           },
           {

src/views/ow/owTask/detailsPage.vue

@@ -155,7 +155,7 @@
                   key="id"
                   label="cnName"
                   res="records"
-                  :disabled="editDisabled || form.whetherEnable == '是'|| form.feeCenterList.filter(item => item.auditStatus > 0).length"
+                  :disabled="editDisabled || form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
                   url="/blade-los/bports/list?status=0&current=1&size=5"
                   :filterable="true"
                   :remote="true"
@@ -225,7 +225,7 @@
                   :collapseTags="true"
                   dataType="string"
                   @selectChange="dicChange('podCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'|| form.feeCenterList.filter(item => item.auditStatus > 0).length"
+                  :disabled="editDisabled || form.whetherEnable == '是' || form.feeCenterList.filter(item => item.auditStatus > 0).length"
                   :slotRight="true"
                   rightLabel="code"
                 ></dic-select>
@@ -250,7 +250,12 @@
               <template slot="boxNumber">
                 <el-input-number
                   v-model="form.boxNumber"
-                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0 || form.feeCenterList.filter(item => item.auditStatus > 0).length"
+                  :disabled="
+                    editDisabled ||
+                      (fixData && form.whetherEnable == '是') ||
+                      form.suitcaseNum != 0 ||
+                      form.feeCenterList.filter(item => item.auditStatus > 0).length
+                  "
                   :min="1"
                   :controls="false"
                   placeholder="请输入 箱量"
@@ -1204,6 +1209,16 @@
         <el-button type="primary" @click.stop="owhySubmit" size="mini">确 定</el-button>
       </span>
     </el-dialog>
+    <fee-modify
+      ref="feeModify"
+      :form="form"
+      @updateDetail="updateDetail"
+      :curCodeDate="form.effectiveDate ? form.effectiveDate + ' 00:00:00' : null"
+      url="/ow/owTask/index"
+      pageStatus=""
+      pageLabel="OW(拿)"
+    ></fee-modify>
+    <fee-modify-view ref="feeModifyView" :form="form"></fee-modify-view>
   </div>
 </template>
 
@@ -1244,6 +1259,8 @@ import { isProcurement } from "@/api/basicData/configuration";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import { getToken } from "@/util/auth";
 import { dateFormat } from "@/util/date";
+import feeModify from "@/components/feeModify/main.vue";
+import feeModifyView from "@/components/feeModify/view.vue";
 import _ from "lodash";
 import { Header } from "element-ui";
 export default {
@@ -3185,7 +3202,9 @@ export default {
     dicSelect,
     checkSchedule,
     businessReports,
-    reports
+    reports,
+    feeModify,
+    feeModifyView
   },
   props: {
     detailData: Object
@@ -3243,6 +3262,9 @@ export default {
     }
   },
   methods: {
+    updateDetail() {
+      this.getDetail(this.form.id);
+    },
     inOwhy() {
       this.owhyDialog = true;
     },
@@ -4890,6 +4912,123 @@ export default {
           this.getPer();
         });
       }
+      if (name == "D申请修改") {
+        for (let row of this.selectionfeedList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus != 4) {
+            return this.$message.error("未审核通过的费用，不允许申请");
+          }
+          if (Number(row.appliedAmount) > 0) {
+            return this.$message.error("请选择未申请付费的费用");
+          }
+          if (Number(row.appliedInvoiceAmount) > 0) {
+            return this.$message.error("请选择未申请发票的费用");
+          }
+          if (Number(row.uninvoicedAmount) > 0) {
+            return this.$message.error("请选择未开票的费用");
+          }
+          if (Number(row.stlTtlAmount) > 0) {
+            return this.$message.error("请选择未结算的费用");
+          }
+          this.$refs.feeModify.openDialog(row, "fix");
+        }
+      }
+      if (name == "D申请删除") {
+        for (let row of this.selectionfeedList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus != 4) {
+            return this.$message.error("未审核通过的费用，不允许申请");
+          }
+          if (Number(row.appliedAmount) > 0) {
+            return this.$message.error("请选择未申请付费的费用");
+          }
+          if (Number(row.appliedInvoiceAmount) > 0) {
+            return this.$message.error("请选择未申请发票的费用");
+          }
+          if (Number(row.uninvoicedAmount) > 0) {
+            return this.$message.error("请选择未开票的费用");
+          }
+          if (Number(row.stlTtlAmount) > 0) {
+            return this.$message.error("请选择未结算的费用");
+          }
+          this.$refs.feeModify.openDialog(row, "del");
+        }
+      }
+      if (name == "D取消申请") {
+        for (let row of this.selectionfeedList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (!(row.auditStatus == 5 || row.auditStatus == 6)) {
+            return this.$message.error("未申请修改或删除，不允许撤销申请");
+          }
+
+          this.$refs.feeModify.openDialog(row, "revoke");
+        }
+      }
+      if (name == "C申请修改") {
+        for (let row of this.selectionCList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus != 4) {
+            return this.$message.error("未审核通过的费用，不允许申请");
+          }
+          if (Number(row.appliedAmount) > 0) {
+            return this.$message.error("请选择未申请付费的费用");
+          }
+          if (Number(row.appliedInvoiceAmount) > 0) {
+            return this.$message.error("请选择未申请发票的费用");
+          }
+          if (Number(row.uninvoicedAmount) > 0) {
+            return this.$message.error("请选择未开票的费用");
+          }
+          if (Number(row.stlTtlAmount) > 0) {
+            return this.$message.error("请选择未结算的费用");
+          }
+          this.$refs.feeModify.openDialog(row, "fix");
+        }
+      }
+      if (name == "C申请删除") {
+        for (let row of this.selectionCList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus != 4) {
+            return this.$message.error("未审核通过的费用，不允许申请");
+          }
+
+          if (Number(row.appliedAmount) > 0) {
+            return this.$message.error("请选择未申请付费的费用");
+          }
+          if (Number(row.appliedInvoiceAmount) > 0) {
+            return this.$message.error("请选择未申请发票的费用");
+          }
+          if (Number(row.uninvoicedAmount) > 0) {
+            return this.$message.error("请选择未开票的费用");
+          }
+          if (Number(row.stlTtlAmount) > 0) {
+            return this.$message.error("请选择未结算的费用");
+          }
+          this.$refs.feeModify.openDialog(row, "del");
+        }
+      }
+      if (name == "C取消申请") {
+        for (let row of this.selectionCList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (!(row.auditStatus == 5 || row.auditStatus == 6)) {
+            return this.$message.error("未申请修改或删除，不允许撤销申请");
+          }
+
+          this.$refs.feeModify.openDialog(row, "revoke");
+        }
+      }
     },
     getPick() {
       let obj = {