Merge branch 'projects/mes-test' into projects/mes-lb

2023-11-28 15:50:00 +08:00
parent 7201c26792 ad56aaf359
commit 99f771a445
22 changed files with 330 additions and 282 deletions
--- a/src/views/extend/processEquMaterialBom/add-or-updata.vue
+++ b/src/views/extend/processEquMaterialBom/add-or-updata.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 16:50:55
+ * @LastEditTime: 2023-11-28 10:03:20
 * @Description:
 -->
 <template>
@@ -53,7 +53,7 @@
          </el-form-item>
        </el-form>
      </div>
-      <div class="drawer-body__footer">
+      <div v-if="!isdetail" class="drawer-body__footer">
        <el-button style="" @click="goback()">取消</el-button>
        <el-button v-if="isdetail" type="primary" @click="goEdit()">
          编辑
--- a/src/views/extend/processEquValueBom/add-or-updata.vue
+++ b/src/views/extend/processEquValueBom/add-or-updata.vue
@@ -1,8 +1,13 @@
 <!--
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
+<<<<<<< HEAD
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-28 10:09:20
+=======
 * @LastEditors: DY
 * @LastEditTime: 2023-11-27 16:37:17
+>>>>>>> projects/mes-test
 * @Description:
 -->
 <template>
@@ -140,7 +145,7 @@ const tableProps = [
    label: '最小值（工艺）',
  },
  {
-    prop: 'manValue',
+    prop: 'maxValue',
    label: '最大值（工艺）',
  },
  {
--- a/src/views/extend/processEquValueBom/attr-add.vue
+++ b/src/views/extend/processEquValueBom/attr-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-11-08 15:30:27
- * @LastEditTime: 2023-11-23 14:26:54
+ * @LastEditTime: 2023-11-28 10:11:40
 * @LastEditors: zhp
 * @Description:
 -->
@@ -84,7 +84,7 @@ export default {
      },
      equipmentId:null,
 			dataRule: {
-				attrName: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+        paramId: [{ required: true, message: '参数名称不能为空', trigger: 'change' }],
 			},
 		};
  },
--- a/src/views/extend/processTraceability/index.vue
+++ b/src/views/extend/processTraceability/index.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-08-01 14:55:51
 * @LastEditors: zhp
- * @LastEditTime: 2023-11-22 14:23:40
+ * @LastEditTime: 2023-11-28 10:34:24
 * @Description:
 -->
 <template>
@@ -26,9 +26,10 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
  getProcessTraceabilityPage,
  getWorkOrderList,
+  getCoreProduct
  // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
-
+import { publicFormatter } from '@/utils/dict';
 const tableProps = [
  {
    prop: 'name',
@@ -44,7 +45,8 @@ const tableProps = [
  },
  {
    prop: 'status',
-    label: '状态'
+    label: '状态',
+    filter: (val) => val == 1 ? '等待' : val == 2 ? '激活' : val == 3 ? '暂停' : val == 4 ? '完成' : '作废',
  },
  {
    prop: 'startProduceTime',
@@ -61,8 +63,9 @@ const tableProps = [
    label: '生产数量'
  },
  {
-    prop: 'unit',
-    label: '单位'
+    prop: 'planProductUnit',
+    label: '单位',
+    filter: publicFormatter('unit_dict')
  },
  {
    prop: 'processFlowName',
@@ -113,7 +116,8 @@ export default {
          selectOptions: [],
          labelField: 'name',
          valueField: 'id',
-          param: 'orderName'
+          param: 'orderName',
+          filterable: true,
        },
        {
          type: 'datePicker',
@@ -182,17 +186,25 @@ export default {
    handleClick(val) {
      if (val.type === "processDetail") {
        console.log(val);
-        this.$router.push({
-          name: 'process-traceability-detail',
-          params: {
-            id: '1715180991838887938',
-            orderId: val.data.id,
-            name: val.data.name,
-            productName: val.data.planProductName,
-            processFlowName: val.data.processFlowName
-            // equipmentName,
-          },
-        });
+        let specificationsData =''
+        getCoreProduct(val.data.planProductId).then((res) => {
+          console.log(res)
+
+          this.$router.push({
+            path: 'process-traceability-detail',
+            query: {
+              id: val.data.processFlowId,
+              orderId: val.data.id,
+              name: val.data.name,
+              specifications: res.data.specifications,
+              productName: val.data.planProductName,
+              processFlowName: val.data.processFlowName,
+              // planProductId: val.data.planProductId
+              // equipmentName,
+            },
+          });
+        })
+
        // this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
      }
    },
--- a/src/views/extend/processTraceabilityDetail/components/ProcessBomList.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessBomList.vue
@@ -117,11 +117,11 @@ export default {
        // },
        { prop: 'name', label: '参数名' },
        {
-          prop: 'name', label: '设定范围最小- 最大 / 标准',
+          prop: 'status', label: '设定范围最小- 最大 / 标准',
          subcomponent: StatusBtn
        },
        {
-          prop: 'code', label: '最小值',
+          prop: '', label: '最小值',
          children: [
            {
              prop: 'minValueSet',
@@ -134,7 +134,7 @@ export default {
          ]
        },
        {
-          prop: 'code', label: '最大值',
+          prop: '', label: '最大值',
          children: [
            {
              prop: 'maxValueSet',
@@ -184,9 +184,9 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
-        // orderId: this.$route.params.orderId,
+        // orderId: this.$route.query.orderId,

      },).then((res) => {
        console.log(res);
@@ -231,25 +231,29 @@ export default {
        getDetMaterial({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        },).then((res) => {
-          this.materialList = res.data[0].data
-          this.name = res.data[0].name
+          if (res.data.length != []) {
+            this.materialList = res.data[0].data
+            this.name = res.data[0].name
+          }
        })
      } else {
        getDetValue({
          pageNo: 1,
          pageSize: 10,
-          orderId: this.$route.params.orderId,
+          orderId: this.$route.query.orderId,
          flowDetId: [this.detId],
-          // orderId: this.$route.params.orderId,
+          // orderId: this.$route.query.orderId,

        }).then((res) => {
-          this.valueList = res.data[0].data
-          this.name = res.data[0].name
+          if (res.data.length != []) {
+            this.valueList = res.data[0].data
+            this.name = res.data[0].name
+          }
        })
      }
    },
@@ -258,12 +262,14 @@ export default {
      getDetMaterial({
        pageNo: 1,
        pageSize: 10,
-        orderId: this.$route.params.orderId,
+        orderId: this.$route.query.orderId,
        flowDetId: [this.detId],
      }).then((res) => {
        console.log(res);
-        this.materialList = res.data[0].data
-        this.name = res.data[0].name
+        if (res.data.length != []) {
+          this.materialList = res.data[0].data
+          this.name = res.data[0].name
+        }
      })
 		},
 		clearList() {
--- a/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
@@ -123,7 +123,7 @@ export default {
 		}
 	},
  mounted() {
-    console.log(this.$route.params.id)
+    console.log(this.$route.query.id)
 		this.loadLayout().then(json => {
 			this.initGraph(json)
 		})
@@ -260,7 +260,7 @@ export default {
 		},

 		async loadLayout() {
-      const flowId = this.$route.params.id;
+      const flowId = this.$route.query.id;
      console.log(flowId)
 			if (!flowId) return { cells: [] }
 			const { code, data } = await this.info({ id: flowId });
@@ -288,12 +288,12 @@ export default {
 		async handleUpdateLayout() {
 			this.layout.content = JSON.stringify(this.graph.toJSON());
 			let code, data;
-			console.table([this.layout, this.$route.params.id])
+			console.table([this.layout, this.$route.query.id])
 			// 手动刷新布局
 			if (this.layout.id) {
 				({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
 			} else {
-				this.layout.flowId = this.$route.params.id;
+				this.layout.flowId = this.$route.query.id;
 				({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
 			}

@@ -410,7 +410,7 @@ export default {
 		},

 		createProcess() {
-			// const flowId = this.$route.params.id;
+			// const flowId = this.$route.query.id;
 			const flowId = this.getFlowId(); // it also works
 			if (!flowId) {
 				this.$modal.msgError('工艺ID不能为空');
--- a/src/views/extend/processTraceabilityDetail/components/ProcessInfo.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessInfo.vue
@@ -20,14 +20,13 @@
        <InfoItem label="产品名称" :value="form.productName" />
      </el-col>
      <el-col :span="6">
-        <InfoItem label="产品规格"  />
+        <InfoItem label="产品规格" :value="form.specifications" />
      </el-col>
    </el-row>
  </section>
 </template>

 <script>
-
 const InfoItem = {
 	name: 'InfoItem',
 	components: {},
@@ -62,6 +61,7 @@ export default {
 				id: null,
 				name: null,
        productName: null,
+        specifications:null,
        processFlowName: null,
 				// remark: null,
 				// enable: null,
@@ -70,7 +70,8 @@ export default {
 		};
 	},
 	mounted() {
-		this.getInfo()
+    this.getInfo()
+    console.log(this.$route.query)
 	},
 	computed: {},
 	methods: {
@@ -95,12 +96,14 @@ export default {
 		// info(payload) {
 		// 	return this.http(this.infoUrl, 'get', payload);
 		// },
-    async getInfo() {
-      this.form.name = this.$route.params.name
-      this.form.productName = this.$route.params.productName
-      this.form.processFlowName = this.$route.params.processFlowName
-      // this.form.name = this.$route.params.name
-      // const flowId = this.$route.params.id;
+    getInfo() {
+      // console.log(this.$route.query.planProductId);
+      this.form.name = this.$route.query.name
+      this.form.specifications = this.$route.query.specifications
+      this.form.productName = this.$route.query.productName
+      this.form.processFlowName = this.$route.query.processFlowName
+      // this.form.name = this.$route.query.name
+      // const flowId = this.$route.query.id;
      // console.log(flowId);
 			// if (!flowId) this.$router.go(-1);
 			// const { code, data } = await this.info({ id: flowId });