Merge branch 'master' into 测试

src/views/production/warehouse/finished-parts-storage/index.vue

@@ -73,7 +73,7 @@
               <el-row>
                 <el-col :span="12">
                   <el-form-item label="事业部" prop="departmentId" style="width: 100%; margin-bottom: 18px">
-                    <el-select v-model="formData.data.departmentId" placeholder="请选择调事业部" clearable style="width: 100%">
+                    <el-select v-model="formData.data.departmentId" placeholder="请选择调事业部" clearable style="width: 100%" disabled>
                       <el-option v-for="item in departmentList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                   </el-form-item>
@@ -414,7 +414,16 @@ const clickViewTodayEntry = () => {
   });
 };
 const judgeUser = () => {
-  return proxy.useUserStore().user.userId === "1";
+  let status = false;
+  if (proxy.useUserStore().user.userId === "1") {
+    status = true;
+  } else {
+    let list = proxy.useUserStore().user.roles.filter((item) => ["factoryAdmin"].includes(item.roleKey));
+    if (list && list.length > 0) {
+      status = true;
+    }
+  }
+  return status;
 };
 const openAdd = ref(false);
 const loadingAdd = ref(false);

src/views/subsidiary/order/management/design.vue

@@ -692,7 +692,7 @@ const getOrderDetail = (parameter) => {
     let list = [formData.data.id];
     if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
       for (let i = 0; i < formData.data.orderSkuList.length; i++) {
-        proxy.post("/skuSpec/getSkuInventoryQuantity", { id: formData.data.orderSkuList[i].skuSpecId }).then((resQuantity) => {
+        proxy.post("/skuSpec/getSkuInventoryQuantity", { id: formData.data.orderSkuList[i].skuSpecId, index: i }).then((resQuantity) => {
           formData.data.orderSkuList[i].inventoryQuantity = resQuantity;
         });
       }