新加修改记录

修改其他修改限制条件

src/components/feeModify/main.vue

@@ -11,7 +11,7 @@
           <template slot="corpTypeUpdate">
             <dic-select v-model="newForm.corpTypeUpdate" key="id" label="cnName" res="records"
               url="/blade-los/bcorpstypedefine/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-              dataName="cnName" @selectChange="dicChange('corpTypeUpdate', $event)"></dic-select>
+              dataName="cnName" @selectChange="dicChange('corpTypeUpdate', $event)" :disabled="newOption.disabled"></dic-select></dic-select>
           </template>
           <template slot="shortNameUpdate">
             <dic-select v-model="newForm.shortNameUpdate" placeholder="结算单位" :key="newForm.corpTypeUpdate"
@@ -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)">
+              @visible-change="visibleChange" @change="dicChange('unitNoUpdate', $event)" :disabled="newOption.disabled"></el-select>
               <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

@@ -103,9 +103,7 @@
             :disabled="
               !selectionDList.length ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == null||e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeedDisabled "
             @click="batchDelete('D')"
           >
             {{ $t("btn118n.deleted") }}
@@ -147,9 +145,7 @@
             :disabled="
               disabled ||
                 selectionDList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+               isFeedDisabled"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -160,9 +156,7 @@
             :disabled="
               disabled ||
                 selectionDList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+               isFeedDisabled "
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -173,9 +167,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeedDisabled "
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -186,9 +178,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeedDisabled"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -199,9 +189,7 @@
             :disabled="
               selectionDList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+               isFeedDisabled "
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -400,16 +388,17 @@
           <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
           <span v-else>{{ row.remarks }}</span>
         </template>
-        <template slot-scope="scope" slot="menu">
+        <template slot-scope="{ row, index }" slot="menu">
           <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
           <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             :disabled="scope.row.accStatus || disabled || pleasereviewType"
             @click="deletefun(scope.row, scope.index, 'D')"
             >删除</el-button
-          >
+          > -->
+          <el-button v-if="row.id" type="text" size="small" @click="rowView(row, index)">查看</el-button>
         </template>
       </avue-crud>
     </el-card>
@@ -442,9 +431,7 @@
             :disabled="
               !selectionCList.length ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == null||e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+              isFeecDisabled "
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -485,9 +472,7 @@
             :disabled="
               disabled ||
                 selectionCList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeecDisabled"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -498,9 +483,7 @@
             :disabled="
               disabled ||
                 selectionCList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeecDisabled"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -513,9 +496,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeecDisabled"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -526,9 +507,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeecDisabled"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -539,9 +518,7 @@
             :disabled="
               selectionCList.length != 1 ||
                 disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+                isFeecDisabled"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -723,16 +700,17 @@
           <el-input v-if="row.edit" v-model="row.remarks" size="small" placeholder="请输入"></el-input>
           <span v-else>{{ row.remarks }}</span>
         </template>
-        <template slot-scope="scope" slot="menu">
+        <template slot-scope="{ row, index }" slot="menu">
           <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>-->
           <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>-->
-          <el-button
+          <!-- <el-button
             type="text"
             size="small"
             :disabled="scope.row.accStatus || disabled || pleasereviewType"
             @click="deletefun(scope.row, scope.index, 'C')"
             >删除</el-button
-          >
+          > -->
+          <el-button v-if="row.id" type="text" size="small" @click="rowView(row, index)">查看</el-button>
         </template>
       </avue-crud>
     </el-card>
@@ -1484,8 +1462,8 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
-        menuWidth: "100",
-        menu: false,
+        menuWidth: 60,
+        menu: true,
         column: [
           {
             label: "index",
@@ -1716,8 +1694,8 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
-        menuWidth: "100",
-        menu: false,
+        menuWidth: 60,
+        menu: true,
         column: [
           {
             label: "index",
@@ -2203,7 +2181,36 @@ export default {
       }
     });
   },
+   computed: {
+    //监听 收费是否允许他人编辑
+    isFeedDisabled() {
+      if (this.assemblyForm.id && this.selectionDList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    },
+    //监听 付费是否允许他人编辑
+    isFeecDisabled() {
+      if (this.assemblyForm.id && this.selectionCList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    }
+  },
   methods: {
+    rowView(row, index) {
+      this.$refs.feeModifyView.openDialog(row);
+    },
     updateDetail() {
       this.$emit("billsDetailfun");
     },

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

@@ -100,16 +100,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              !selectionDList.length ||
-                disabled ||
-                (assemblyForm.id &&
-                  assemblyForm.id &&
-                  !(
-                    selectionDList.filter(e => e.createUser == null || e.createUser == 0 || e.createUser == userId).length > 0 ||
-                    roleName.indexOf('允许修改他人费用') >= 0
-                  ))
-            "
+            :disabled="!selectionDList.length || disabled || (assemblyForm.id && assemblyForm.id && isFeedDisabled)"
             @click="batchDelete('D')"
           >
             {{ $t("btn118n.deleted") }}
@@ -148,12 +139,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionDList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="disabled || selectionDList.length == 0 || isFeedDisabled"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -161,12 +147,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionDList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="disabled || selectionDList.length == 0 || isFeedDisabled"
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -174,12 +155,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -187,12 +163,7 @@
             type="success"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -200,12 +171,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              selectionDList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionDList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionDList.length != 1 || disabled || isFeedDisabled"
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -453,15 +419,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              !selectionCList.length ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(
-                    selectionCList.filter(e => e.createUser == null || e.createUser == 0 || e.createUser == userId).length > 0 ||
-                    roleName.indexOf('允许修改他人费用') >= 0
-                  ))
-            "
+            :disabled="!selectionCList.length || disabled || isFeecDisabled"
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -499,12 +457,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionCList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="disabled || selectionCList.length == 0 || isFeecDisabled"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
           >
@@ -512,12 +465,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              disabled ||
-                selectionCList.length == 0 ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="disabled || selectionCList.length == 0 || isFeecDisabled"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
@@ -527,12 +475,7 @@
             type="primary"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
           >
@@ -540,12 +483,7 @@
             type="success"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
@@ -553,12 +491,7 @@
             type="danger"
             plain
             size="small"
-            :disabled="
-              selectionCList.length != 1 ||
-                disabled ||
-                (assemblyForm.id &&
-                  !(selectionCList.filter(e => e.createUser == 0 || e.createUser == userId).length > 0 || roleName.indexOf('允许修改他人费用') >= 0))
-            "
+            :disabled="selectionCList.length != 1 || disabled || isFeecDisabled"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
           >
@@ -2197,6 +2130,32 @@ export default {
       userId: JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id
     };
   },
+  computed: {
+    //监听 收费是否允许他人编辑
+    isFeedDisabled() {
+      if (this.assemblyForm.id && this.selectionDList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    },
+    //监听 付费是否允许他人编辑
+    isFeecDisabled() {
+      if (this.assemblyForm.id && this.selectionCList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    }
+  },
   async created() {
     isProcurement({ param: "if.station" }).then(res => {
       console.log(res);

src/views/ow/owTask/detailsPage.vue

@@ -571,6 +571,15 @@
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0" @click="allClick('D撤销请核')"
                   >撤销请核</el-button
                 >
+                <!-- <el-button type="primary" plain size="small" :disabled="disabled" @click="allClick('D申请修改')">{{
+                  $t("btn118n.applyModify")
+                }}</el-button>
+                <el-button type="success" plain size="small" :disabled="disabled" @click="allClick('D申请删除')">{{
+                  $t("btn118n.applyDelete")
+                }}</el-button>
+                <el-button type="danger" plain size="small" :disabled="disabled" @click="allClick('D取消申请')">{{
+                  $t("btn118n.unAplly")
+                }}</el-button> -->
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{ row, index }">
@@ -3195,6 +3204,32 @@ export default {
     });
     this.saveLocalCurrency(this.deptId);
   },
+  computed: {
+     //监听 收费是否允许他人编辑
+    isFeedDisabled() {
+      if (this.form.id && this.selectionfeedList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    },
+    //监听 付费是否允许他人编辑
+    isFeecDisabled() {
+      if (this.form.id && this.selectionfeecList.filter(e => e.id && e.createUser != this.userId).length > 0) {
+        if (this.roleName.includes("允许修改他人费用")) {
+          return false;
+        } else {
+          return true;
+        }
+      } else {
+        return false;
+      }
+    }
+  },
   methods: {
     inOwhy() {
       this.owhyDialog = true;
@@ -4417,13 +4452,7 @@ export default {
             return this.$message.error("已申请费用，不允许重复申请");
           }
         }
-        if (
-          this.form.id &&
-          !(
-            this.selectionfeedList.filter(e => e.createUser == 0 || e.createUser == this.userId).length > 0 ||
-            this.roleName.indexOf("允许修改他人费用") >= 0
-          )
-        ) {
+        if (this.isFeedDisabled) {
           return this.$message.error("不允许申请他人费用");
         }
         this.$confirm("确定申请费用?", {
@@ -4514,13 +4543,7 @@ export default {
             return this.$message.error("已申请费用，不允许重复申请");
           }
         }
-        if (
-          this.form.id &&
-          !(
-            this.selectionfeecList.filter(e => e.createUser == 0 || e.createUser == this.userId).length > 0 ||
-            this.roleName.indexOf("允许修改他人费用") >= 0
-          )
-        ) {
+        if (this.isFeecDisabled) {
           return this.$message.error("不允许申请他人费用");
         }
         this.$confirm("确定申请费用?", {