允许修改他人业务可以修改业务 出库工单去掉完成出库校验

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

@@ -1861,6 +1861,9 @@ export default {
         },
         // 判断是否可以编辑别人业务
         ModifyOthersfun() {
+            console.log(this.saberUserInfo.role_name.indexOf(
+                "允许修改他人业务"
+            ) != -1)
             let sumArr = [];
             const h = this.$createElement;
             // 判断是否有权限
@@ -1872,13 +1875,17 @@ export default {
                     : false
             )
                 return false;
+
             // 当前登录人和选择的创建人对比是不是一个人
             for (let item of this.selectionList) {
-                if (this.saberUserInfo.user_id != item.createUser) {
-                    sumArr.push(
-                        h("p", `你没有"允许修改他人业务"权限,请重新选择数据`)
-                    );
+                if (!(this.saberUserInfo.role_name.indexOf("admin") != -1||this.saberUserInfo.role_name.indexOf("允许修改他人业务") != -1)) {
+                    if (this.saberUserInfo.user_id != item.createUser) {
+                        sumArr.push(
+                            h("p", `你没有"允许修改他人业务"权限,请重新选择数据`)
+                        );
+                    }
                 }
+
             }
             if (sumArr.length != 0) {
                 this.$confirm("提示", {

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -297,106 +297,106 @@ export default {
             type: 'sum',
           }],
         column: [
-        //   {
-        //   label: '商品名称',
-        //   prop: 'goodsId',
-        //   disabled: true,
-        //   width: 200,
-        //   overHidden: true,
-        //   hide: true,
-        //   type: 'select',
-        //   remote: true,
-        //   props: {
-        //     label: 'cname',
-        //     value: 'id'
-        //   },
-        //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
-        // },
-        {
-          label: '商品名称',
-          prop: 'goodsName',
-          disabled: true,
-          width: 200,
-          overHidden: true,
-        }, {
-          label: '商品编码',
-          disabled: true,
-          prop: 'goodsNo',
-          width: 100
-        }, {
-          label: '品牌',
-          prop: 'brandId',
-          disabled: true,
-          width: 100,
-          overHidden: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
-        }, {
-          label: '规格型号',
-          prop: 'propertyName',
-          disabled: true,
-          width: 100
-        }, {
-          label: '花纹',
-          prop: 'pattern',
-          disabled: true,
-          width: 100
-        }, {
-          label: '商品描述',
-          prop: 'goodsDescription',
-          disabled: true,
-        }, {
-          label: '批次号',
-          prop: 'dot',
-          cell: true,
-          type: 'select',
-          disabled: true,
-          dicData: [],
-          props: {
-            label: "dot",
-            value: "dot"
+          //   {
+          //   label: '商品名称',
+          //   prop: 'goodsId',
+          //   disabled: true,
+          //   width: 200,
+          //   overHidden: true,
+          //   hide: true,
+          //   type: 'select',
+          //   remote: true,
+          //   props: {
+          //     label: 'cname',
+          //     value: 'id'
+          //   },
+          //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+          // },
+          {
+            label: '商品名称',
+            prop: 'goodsName',
+            disabled: true,
+            width: 200,
+            overHidden: true,
+          }, {
+            label: '商品编码',
+            disabled: true,
+            prop: 'goodsNo',
+            width: 100
+          }, {
+            label: '品牌',
+            prop: 'brandId',
+            disabled: true,
+            width: 100,
+            overHidden: true,
+            type: 'select',
+            props: {
+              label: 'cname',
+              value: 'id'
+            },
+            dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1'
+          }, {
+            label: '规格型号',
+            prop: 'propertyName',
+            disabled: true,
+            width: 100
+          }, {
+            label: '花纹',
+            prop: 'pattern',
+            disabled: true,
+            width: 100
+          }, {
+            label: '商品描述',
+            prop: 'goodsDescription',
+            disabled: true,
+          }, {
+            label: '批次号',
+            prop: 'dot',
+            cell: true,
+            type: 'select',
+            disabled: true,
+            dicData: [],
+            props: {
+              label: "dot",
+              value: "dot"
+            },
+            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+          }, {
+            label: '单位',
+            prop: 'units',
+            type: "select",
+            disabled: true,
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
+          }, {
+            label: '库存',
+            prop: 'inventory',
+          }, {
+            label: '出库数量',
+            prop: 'goodsNum',
+            disabled: false,
+          }, {
+            label: '发货数量',
+            prop: 'sendNum',
+            cell: true,
+            disabled: false,
+          }, {
+            label: '备注',
+            prop: 'remarks'
           },
-          dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-        }, {
-          label: '单位',
-          prop: 'units',
-          type: "select",
-          disabled: true,
-          props: {
-            label: "dictValue",
-            value: "dictValue"
+          {
+            label: '自有数',
+            prop: 'sendNumHave',
+            overHidden: true,
           },
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
-        }, {
-          label: '库存',
-          prop: 'inventory',
-        }, {
-          label: '出库数量',
-          prop: 'goodsNum',
-          disabled: false,
-        }, {
-          label: '发货数量',
-          prop: 'sendNum',
-          cell: true,
-          disabled: false,
-        }, {
-          label: '备注',
-          prop: 'remarks'
-        },
-        {
-          label: '自有数',
-          prop: 'sendNumHave',
-          overHidden: true,
-        },
-        {
-          label: '代采数',
-          prop: 'sendNumFinancing',
-          overHidden: true,
-        }]
+          {
+            label: '代采数',
+            prop: 'sendNumFinancing',
+            overHidden: true,
+          }]
       },
       optionPaymentDetails: {},
       optionPaymentDetailsBack: {
@@ -663,14 +663,16 @@ export default {
           });
           console.log(this.form)
           // 判断处理
-          for (let index in this.form.shipItemsList) {
-            this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
-            if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
-              this.$message.warning(`序号${index + 1}的实际数量不能大于库存`);
-              loading.close();
-              return
-            }
-          }
+          // if (this.form.statusName != '已出库') {
+          //   for (let index in this.form.shipItemsList) {
+          //     this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
+          //     if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
+          //       this.$message.warning(`序号${index + 1}的实际数量不能大于库存`);
+          //       loading.close();
+          //       return
+          //     }
+          //   }
+          // }
           // this.form.shipItemsList.forEach(item => {
           //   item.goodsName = item.$goodsId
           // })
@@ -680,22 +682,22 @@ export default {
             bizTypeName: "FHGD",
             filesList: this.filesList
           }).then(res => {
-              if (res.data.code === 601) {
-                  console.info('11111111111----', res)
-                  if (this.onLoad.id && this.detailData.id) {
-                      console.log(1);
-                      this.refresh(this.onLoad.id, true)
-                      this.$set(this.optionForm, 'disabled', true)
-                  } else if (this.onLoad.id) {
-                      console.log(2);
-                      this.refresh(this.onLoad.id, true)
-                  }
-                  this.$message({
-                      type: "error",
-                      message: res.data.msg
-                  });
-                  return true
+            if (res.data.code === 601) {
+              console.info('11111111111----', res)
+              if (this.onLoad.id && this.detailData.id) {
+                console.log(1);
+                this.refresh(this.onLoad.id, true)
+                this.$set(this.optionForm, 'disabled', true)
+              } else if (this.onLoad.id) {
+                console.log(2);
+                this.refresh(this.onLoad.id, true)
               }
+              this.$message({
+                type: "error",
+                message: res.data.msg
+              });
+              return true
+            }
             this.$message.success("保存成功");
             this.refresh(res.data.data.id)
             loading.close();