1

src/views/JXSK/production/bom/index.vue

@@ -448,6 +448,9 @@ const formConfig = reactive([
     disabled: false,
     filterable: true,
     data: [],
+    style: {
+      width: "100%",
+    },
   },
   {
     type: "title",

src/views/JXSK/production/forward/index.vue

@@ -36,23 +36,23 @@
                 <div>
                   <div
                     style="
-                      font: 14px fantasy;
+                      font-size: 14px;
                       font-weight: 700;
                       color: #000;
                       line-height: 32px;
                     "
                   >
-                    产品名称：
+                    产品：{{ printData.productName }}
                   </div>
                   <div
                     style="
-                      font: 14px fantasy;
+                      font-size: 14px;
                       font-weight: 700;
                       color: #000;
                       line-height: 32px;
                     "
                   >
-                    客户名称：
+                    客户：{{ printData.customerName }}
                   </div>
                 </div>
               </div>
@@ -404,6 +404,7 @@ const submitForm = (flag) => {
 };
 const submitType = ref("");
 const submitText = ref("");
+const printData = ref({});
 const getDtl = (row) => {
   if (
     row.nextProductionProcessesId == "" ||
@@ -418,6 +419,10 @@ const getDtl = (row) => {
   // formOption.disabled = true;
   formData.data = { ...row, fileList: [] };
   dialogVisible.value = true;
+  printData.value = {
+    customerName: row.customerName,
+    productName: row.productName + `（${row.productSpec}）`,
+  };
   let barCode = row.productSn;
   nextTick(() => {
     JsBarcode("#barCode", barCode, {

src/views/JXSK/production/plan/index.vue

@@ -11,6 +11,8 @@
         :table-events="{
           select: select,
         }"
+        :onMoreSearch="true"
+        @moreSearch="clickMoreSearch"
         :action-list="[
           {
             text: '添加计划',
@@ -62,6 +64,29 @@
         </el-button>
       </template>
     </el-dialog>
+
+    <el-dialog
+      :title="'高级检索'"
+      v-model="formSearchDialog"
+      width="700"
+      v-loading="loading"
+      destroy-on-close
+    >
+      <byForm
+        :formConfig="formSearchConfig"
+        :formOption="formOption"
+        v-model="sourceList.pagination"
+        :rules="rules"
+        ref="byform"
+      >
+      </byForm>
+      <template #footer>
+        <el-button @click="moreSearchReset" size="large">重置</el-button>
+        <el-button @click="moreSearchQuery" type="primary" size="large"
+          >搜索</el-button
+        >
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -80,6 +105,8 @@ const sourceList = ref({
     pageNum: 1,
     pageSize: 10,
     keyword: "",
+    beginTime: "",
+    endTime: "",
   },
 });
 const dialogVisible = ref(false);
@@ -392,6 +419,49 @@ const changeFn = (val) => {
     formData.data.waitQuantity = current.remainingQuantity;
   }
 };
+const formSearchDialog = ref(false);
+const formSearchConfig = computed(() => {
+  return [
+    {
+      type: "date",
+      itemType: "date",
+      prop: "beginTime",
+      label: "计划开始时间",
+      itemWidth: 50,
+      style: {
+        width: "100%",
+      },
+    },
+    {
+      type: "date",
+      itemType: "date",
+      prop: "endTime",
+      label: "计划结束时间",
+      itemWidth: 50,
+      style: {
+        width: "100%",
+      },
+    },
+  ];
+});
+const clickMoreSearch = () => {
+  formSearchDialog.value = true;
+};
+const moreSearchQuery = () => {
+  formSearchDialog.value = false;
+  getList();
+};
+const moreSearchReset = () => {
+  sourceList.value.pagination = {
+    total: 0,
+    pageNum: sourceList.value.pagination.pageNum,
+    pageSize: sourceList.value.pagination.pageSize,
+    keyword: "",
+    beginTime: "",
+    endTime: "",
+  };
+  moreSearchQuery();
+};
 </script>
 
 <style lang="scss" scoped>

src/views/JXSK/production/schedule/index.vue

@@ -235,7 +235,7 @@ const config = computed(() => {
       attrs: {
         label: "完成时间",
         prop: "finishTime",
-        width: 155,
+        width: 160,
       },
     },
   ];

src/views/JXSK/production/workOrder/index.vue

@@ -69,6 +69,9 @@
       >
         <template #slot>
           <div style="width: 100%">
+            <div style="color: red; font-size: 14px">
+              注意：这是单个产品的物料
+            </div>
             <el-button type="primary" plain @click="openMaterial = true"
               >添加物料/半成品</el-button
             >
@@ -449,7 +452,7 @@ const config = computed(() => {
       attrs: {
         label: "合同创建时间",
         prop: "contractCreateTime",
-        width: 155,
+        width: 160,
       },
     },
     {

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

@@ -97,7 +97,7 @@
                 v-for="(product, index) in productList"
                 :key="product.id"
                 @close="handleRemove(index)"
-                >{{ product.name }}</el-tag
+                >{{ product.name }}（{{ product.spec }}）</el-tag
               >
             </div>
           </div>

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

@@ -199,6 +199,14 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "工单号",
+        prop: "workOrderCode",
+        width: 120,
+      },
+    },
+
+    {
+      attrs: {
         label: "物品编码",
         prop: "productCode",
         width: 160,

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

@@ -205,14 +205,14 @@ const config = computed(() => {
     {
       attrs: {
         label: "需出库数量",
-        prop: "quantityaa",
+        prop: "quantity",
         width: 120,
       },
     },
     {
       attrs: {
         label: "待出库数量",
-        prop: "quantity",
+        prop: "waitQuantity",
         width: 120,
       },
     },
@@ -293,7 +293,7 @@ const getList = async (req) => {
     .then((res) => {
       sourceList.value.data = res.rows.map((x) => ({
         ...x,
-        quantity: (x.quantity - x.receiptQuantity).toFixed(4),
+        waitQuantity: (x.quantity - x.receiptQuantity).toFixed(4),
       }));
       sourceList.value.pagination.total = res.total;
       setTimeout(() => {
@@ -351,6 +351,13 @@ const formConfig = computed(() => {
     {
       type: "input",
       prop: "quantity",
+      label: "需出库数量",
+      itemType: "text",
+      disabled: true,
+    },
+    {
+      type: "input",
+      prop: "waitQuantity",
       label: "待出库数量",
       itemType: "text",
       disabled: true,
@@ -402,7 +409,9 @@ const rules = ref({
 const submitForm = () => {
   submit.value.handleSubmit(() => {
     loadingDialog.value = true;
-    if (formData.data.warehousingQuantity > Number(formData.data.quantity)) {
+    if (
+      formData.data.warehousingQuantity > Number(formData.data.waitQuantity)
+    ) {
       return ElMessage({
         message: "出库数量不可大于待出库数量",
         type: "info",

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

@@ -58,23 +58,23 @@
         <div>
           <div
             style="
-              font: 14px fantasy;
+              font-size: 14px;
               font-weight: 700;
               color: #000;
               line-height: 32px;
             "
           >
-            产品名称：
+            产品：{{ printData.productName }}
           </div>
           <div
             style="
-              font: 14px fantasy;
+              font-size: 14px;
               font-weight: 700;
               color: #000;
               line-height: 32px;
             "
           >
-            客户名称：
+            客户：{{ printData.customerName }}
           </div>
         </div>
       </div>
@@ -486,9 +486,14 @@ const onPreviewFile = (file) => {
 };
 
 const printDialog = ref(false);
+const printData = ref({});
 const handlePrint = (row) => {
   printDialog.value = true;
   let barCode = row.productSn;
+  printData.value = {
+    customerName: row.customerName,
+    productName: row.productName + `（${row.productSpec}）`,
+  };
   nextTick(() => {
     JsBarcode("#barCode", barCode, {
       format: "CODE128", //选择要使用的条形码类型