部分新功能

src/components/headerBar/header-bar.vue

@@ -350,7 +350,6 @@
               <span v-if="item.type==1">销售合同需出货，请及时跟进。</span><span v-if="item.type==2">采购合同将到货，请及时跟进。</span>
             </div>
           </div>
-
         </div>
       </template>
     </el-drawer>
@@ -789,15 +788,13 @@ const openDetails = (row) => {
       },
     });
   } else {
-    let submitType = row.dataResource > 0 ? "10" : "20";
     proxy.$router.push({
       path: "/platform_manage/process/processApproval",
       query: {
-        flowKey: submitType == "10" ? "ehsd_purchase_flow" : "purchase_flow",
+        flowKey: "purchase_flow",
         id: row.flowId,
         processType: 20,
         businessId: row.id,
-        submitType,
       },
     });
   }

src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -25,7 +25,8 @@
 
         <template #produceStatus="{ item }">
           <div style="width: 100%">
-            <span :class="item.produceStatus==10?'tag-active':''"> {{ dictValueLabel(item.produceStatus, produceStatusData) }}</span>
+            <span v-if="item.produceStatus==0 || item.produceStatus" :class="item.produceStatus==10?'tag-active':'tag-active-1'">
+              {{ dictValueLabel(item.produceStatus, produceStatusData) }}</span>
           </div>
         </template>
 
@@ -482,7 +483,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "生产状态",
-        prop: "produceStatus",
+        // prop: "produceStatus",
         slot: "produceStatus",
         width: 100,
       },

src/views/MES/productionOrder/index.vue

@@ -398,7 +398,6 @@ const config = computed(() => {
         width: 160,
       },
     },
-
     {
       attrs: {
         label: "完工时间",

src/views/MES/productionTask/index.vue

@@ -259,18 +259,57 @@
       <byForm :formConfig="recordFormConfig" :formOption="recordFormOption" v-model="formData.recordData">
         <template #detail1>
           <div style="width:100%">
-            a
+            <el-table :data="formData.recordData.purchaseProductList">
+              <el-table-column label="商品图片" width="80">
+                <template #default="{ row }">
+                  <div v-if="row.fileUrl">
+                    <img :src="row.fileUrl" class="pic" @click="openImg(row.fileUrl)" />
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="productCode" label="商品编码" width="160" />
+              <el-table-column prop="productName" label="商品名称" min-width="130" />
+              <el-table-column label="尺寸 (cm)" width="140">
+                <template #default="{ row, $index }">
+                  <div style="width: 100%">
+                    {{row.productLength}} * {{row.productWidth}} * {{row.productHeight}}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="颜色" prop="productColor" width="160" />
+              <el-table-column label="采购数量" prop="quantity" width="100" />
+            </el-table>
           </div>
         </template>
         <template #detail2>
           <div style="width:100%">
-            b
+            <el-table :data="formData.recordData.stockJournalDetailsList">
+              <el-table-column label="类型" width="100" :formatter="(row) => row.opType=='1'?'入库':'出库'" />
+              <el-table-column label="商品图片" width="80">
+                <template #default="{ row }">
+                  <div v-if="row.fileUrl">
+                    <img :src="row.fileUrl" class="pic" @click="openImg(row.fileUrl)" />
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="productCode" label="商品编码" width="160" />
+              <el-table-column prop="productName" label="商品名称" min-width="130" />
+              <el-table-column label="尺寸 (cm)" width="140">
+                <template #default="{ row, $index }">
+                  <div style="width: 100%">
+                    {{row.productLength}} * {{row.productWidth}} * {{row.productHeight}}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="颜色" prop="productColor" width="160" />
+              <el-table-column label="数量" prop="quantity" width="100" />
+            </el-table>
           </div>
         </template>
       </byForm>
-      <template #footer>
+      <!-- <template #footer>
         <el-button @click="recordDialog = false" size="defualt" v-debounce>关闭</el-button>
-      </template>
+      </template> -->
     </el-dialog>
   </div>
 
@@ -909,6 +948,46 @@ const recordFormConfig = computed(() => {
 });
 const lookDetails = (item) => {
   recordDialog.value = true;
+  proxy
+    .post("/produceOrder/detail", {
+      id: item.produceOrderId,
+    })
+    .then((res) => {
+      console.log(res, "aaa");
+      formData.recordData = res;
+      if (
+        formData.recordData.purchaseProductList &&
+        formData.recordData.purchaseProductList.length > 0
+      ) {
+        let productIds = formData.recordData.purchaseProductList.map(
+          (x) => x.productId
+        );
+        proxy.getFileData({
+          businessIdList: productIds,
+          data: formData.recordData.purchaseProductList,
+          att: "productId",
+          businessType: "0",
+          fileAtt: "fileList",
+          filePathAtt: "fileUrl",
+        });
+      }
+      if (
+        formData.recordData.stockJournalDetailsList &&
+        formData.recordData.stockJournalDetailsList.length > 0
+      ) {
+        let productIds = formData.recordData.stockJournalDetailsList.map(
+          (x) => x.productId
+        );
+        proxy.getFileData({
+          businessIdList: productIds,
+          data: formData.recordData.stockJournalDetailsList,
+          att: "productId",
+          businessType: "0",
+          fileAtt: "fileList",
+          filePathAtt: "fileUrl",
+        });
+      }
+    });
 };
 </script>
 

src/views/index.vue

@@ -138,7 +138,6 @@
           </el-table>
         </el-card>
       </div>
-
     </div>
     <div class="table-warp">
       <div style="margin-bottom:15px">

src/views/production/project/technology/index.vue

@@ -462,6 +462,7 @@ const getDtl = (row) => {
     nodeObject.value = res.nodeObject;
     // productList.value = res.applicableProductsList;
     // selectLine.value = res.processRouteList.map((x) => x.id);
+    res.isBatchMode = res.isBatchMode + "";
     formData.data = res;
     dialogVisible.value = true;
   });

src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -23,9 +23,9 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column label="需入库数量" prop="quantity" width="100" />
-              <el-table-column label="待入库数量" prop="waitQuantity" width="100" />
-              <el-table-column label="已入库数量" prop="receiptQuantity" width="100" />
+              <el-table-column label="需出库数量" prop="quantity" width="100" />
+              <el-table-column label="待出库数量" prop="waitQuantity" width="100" />
+              <el-table-column label="已出库数量" prop="receiptQuantity" width="100" />
             </el-table>
           </div>
         </template>
@@ -55,10 +55,10 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="需入库数量" prop="needQuantity" width="100" />
-                <el-table-column label="待入库数量" prop="waitQuantity" width="100" />
-                <el-table-column label="已入库数量" prop="receiptQuantity" width="100" />
-                <el-table-column prop="quantity" label="入库数量" width="130">
+                <el-table-column label="需出库数量" prop="needQuantity" width="100" />
+                <el-table-column label="待出库数量" prop="waitQuantity" width="100" />
+                <el-table-column label="已出库数量" prop="receiptQuantity" width="100" />
+                <el-table-column prop="quantity" label="出库数量" width="130">
                   <template #default="{ row, $index }">
                     <el-form-item :prop="'stockWaitDetailsList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true"
                                   class="margin-b-0">
@@ -450,7 +450,7 @@ const formConfig = computed(() => {
 });
 const rules = ref({
   warehouseId: [{ required: true, message: "请选择仓库", trigger: "change" }],
-  quantity: [{ required: true, message: "请输入入库数量", trigger: "blur" }],
+  quantity: [{ required: true, message: "请输入出库数量", trigger: "blur" }],
   fileList: [
     { required: true, message: "请上传凭证", trigger: ["blur", "change"] },
   ],
@@ -463,7 +463,7 @@ const submitForm = () => {
     for (let i = 0; i < formData.data.stockWaitDetailsList.length; i++) {
       const ele = formData.data.stockWaitDetailsList[i];
       if (Number(ele.quantity) > Number(ele.waitQuantity)) {
-        return proxy.msgTip("入库数量不可大于待入库数量", 2);
+        return proxy.msgTip("出库数量不可大于待出库数量", 2);
       }
     }
     loadingDialog.value = true;

src/views/systemTenant/tenant/deptTenant/index.vue

@@ -27,7 +27,7 @@
         <el-table-column label="操作" align="center" width="200">
           <template #default="{ row }">
             <el-button link type="primary" @click="getDtl(row)">修改</el-button>
-            <el-button link type="primary" @click="openModal(row.deptId)">添加子项</el-button>
+            <el-button link type="primary" @click="openModal(row)" v-if="row.type!=3">添加子项</el-button>
             <!-- <el-button link type="primary" @click="openRoomModal(row)">权限</el-button> -->
             <el-button v-if="checkIsTopData(row.parentId)" link type="primary" @click="listDelete(row)">删除</el-button>
           </template>
@@ -39,7 +39,7 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
         <template #parentId>
           <div style="width: 100%">
-            <el-tree-select v-model="formData.data.parentId" :data="sourceList.data" :disabled="isTopData && modalType=='edit'" check-strictly
+            <el-tree-select v-model="formData.data.parentId" :data="sourceList.data" :disabled="modalType=='edit'" check-strictly
                             :render-after-expand="false" node-key="deptId" :props="defaultProps" style="width:100%" />
           </div>
         </template>
@@ -181,7 +181,7 @@ const formConfig = computed(() => {
       prop: "type",
       label: "机构类型",
       data: typeList.value,
-      disabled: isTopData.value && modalType.value == "edit",
+      disabled: modalType.value == "edit" || disabledType.value,
       style: {
         width: "100%",
       },
@@ -238,12 +238,21 @@ const rules = ref({
   type: [{ required: true, message: "请选择机构类型", trigger: "change" }],
   orderNum: [{ required: true, message: "请输入部门排序", trigger: "blur" }],
 });
-const openModal = (val) => {
+const disabledType = ref(false);
+const openModal = (row) => {
+  disabledType.value = false;
   modalType.value = "add";
   formData.data = {
-    parentId: val || "",
-    tenantId: useUserStore().user.tenantId,
+    parentId: "",
+    tenantId: proxy.useUserStore().user.tenantId,
   };
+  if (row && row.deptId) {
+    formData.data.parentId = row.deptId;
+    if (row.type == 2) {
+      formData.data.type = 3;
+      disabledType.value = true;
+    }
+  }
   loadingDialog.value = false;
   dialogVisible.value = true;
 };
@@ -290,9 +299,9 @@ const checkIsTopData = (parentId) => {
 };
 const getDtl = (row, index) => {
   // 修改的时候，反查所有数据，如果能找到当前的父级id则不是第一级数据
-  isTopData.value = !checkIsTopData(row.parentId);
+  // isTopData.value = !checkIsTopData(row.parentId);
   formData.data = proxy.deepClone(row);
-  formData.data.nature = row.nature + "";
+  formData.data.nature = row.nature ? row.nature : "" + "";
   modalType.value = "edit";
   formData.data.leaderId =
     formData.data.leaderId == "-1" ? "" : formData.data.leaderId;