质量管理

src/views/base/custom/index.vue

@@ -134,7 +134,7 @@ import printPreview from './preview'
 import { MessageBox } from 'element-ui'
 import { hiprint } from 'vue-plugin-hiprint'
 import providers from './providers'
-import printData from './print-data'
+// import printData from './print-data'
 import $ from 'jquery'
 import SmallTitle from './SmallTitle.vue'
 let hiprintTemplate = null
@@ -160,6 +160,7 @@ export default {
         // width: 220,
         // height: 80
       },
+      printData:{},
       drawer: false,
       // 纸张类型
       paperTypes: {
@@ -355,13 +356,13 @@ export default {
     },
     preView() {
       const { width } = this.curPaper
-      this.$refs.preView.show(hiprintTemplate, printData, width)
+      this.$refs.preView.show(hiprintTemplate, this.printData, width)
     },
     print() {
       // if (window.hiwebSocket.opened) {
       const printerList = hiprintTemplate.getPrinterList()
       console.log(printerList)
-      hiprintTemplate.print2(printData, { printer: '', title: '预览打印' })
+      hiprintTemplate.print2(this.printData, { printer: '', title: '预览打印' })
       // return
       // }
       // this.$message.error('客户端未连接,无法直接打印')

src/views/base/mixins/basic-page.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: DY
- * @LastEditTime: 2023-09-21 16:02:07
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-11-01 10:30:12
  * @Description:
  */
 export default {
@@ -101,7 +101,7 @@ export default {
     },
     // 删除
     deleteHandle(id, name, index) {
-      this.$confirm(`确定对${name ? '[名称=' + name + ']' : '[序号=' + index + ']'}进行删除操作?`, "提示", {
+      this.$confirm(`是否确认删除${name ? '[' + name + ']' : '[' + index + ']'}数据项?`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/base/packagingPrintLog/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-30 10:44:48
+ * @LastEditTime: 2023-11-01 15:51:50
  * @Description:
 -->
 <template>
@@ -47,6 +47,7 @@ import {
 import {
 	deletePacking,
   getPackingPage,
+  getWorkOrderList,
 	exportPackingExcel,
 } from '@/api/base/packingInfo';
 
@@ -102,37 +103,41 @@ export default {
 							btnName: '编辑',
 					  }
           : undefined,
-        {
-          type: 'print',
-          btnName: '打印',
-        },
         this.$auth.hasPermi(`base:packaging-print-log:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
           : undefined,
-
+        {
+          type: 'print',
+          btnName: '打印',
+        },
 			].filter((v) => v),
 			tableData: [],
-			formConfig: [
-				{
-					type: 'input',
+      formConfig: [
+        {
+          type: 'select',
           label: '工单',
-          placeholder: '工单',
-          param: 'workOrderId',
-				},
-				{
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'id',
+          param: 'workOrderId'
+        },
+        {
           // parent: 'dateFilterType',
-          // 日期选择
+          // 时间段选择
           type: 'datePicker',
-          label: '时间',
-          dateType: 'date',
-          placeholder: '选择日期',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
+          // label: '时间段',
+          dateType: 'daterange',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          defaultTime: ['00:00:00', '00:00:00'],
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
           param: 'createTime',
-				},
+        },
 				{
 					type: 'button',
 					btnName: '搜索',
@@ -173,7 +178,9 @@ export default {
 	components: {
 		AddOrUpdate,
 	},
-	created() {},
+  created() {
+    this.getDict()
+  },
   methods: {
     getDataList() {
       this.dataListLoading = true;
@@ -183,6 +190,30 @@ export default {
         this.dataListLoading = false;
       });
     },
+    getDict() {
+      // 获取产品的属性列表
+      // getCustomerList().then((response) => {
+      //   console.log(response);
+      //   this.customerList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      // getModelList().then((response) => {
+      //   console.log(response);
+      //   this.modelList = response.data
+      //   // this.listQuery.total = response.data.total;
+      // })
+      getWorkOrderList().then((response) => {
+        // console.log(response);
+        this.formConfig[0].selectOptions = response.data.map((item) => {
+          return {
+            name: item.name,
+            id: item.id
+          }
+        })
+        console.log(this.formConfig[0].selectOptions);
+        // this.listQuery.total = response.data.total;
+      })
+    },
     handlePrint(id) {
       if (id) {
         getPackingModel(id).then(res => {
@@ -259,8 +290,14 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-          this.listQuery.packagingCode = val.packagingCode;
-          this.listQuery.createTime = val.createTime;
+          this.listQuery.workOrderId = val.workOrderId;
+          if (val.createTime && val.createTime.length != 0) {
+            this.listQuery.createTime = val.createTime
+            // this.listQuery.createTime[1] = val.timeVal[1]
+          } else {
+            this.listQuery.createTime = undefined
+            // this.listQuery.endTime = undefined
+          }
           this.getDataList();
           console.log(this.tableData)
 					break;

src/views/base/packagingPrintModel/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2023-10-30 10:45:23
+ * @LastEditTime: 2023-11-01 10:28:29
  * @Description:
 -->
 <template>
@@ -44,7 +44,7 @@ const tableProps = [
 	{
     prop: 'printModel',
     label: '打印方式',
-    filter: (val) => val ==1 ? '自动打印' : '自动打印',
+    filter: (val) => val ==1 ? '自动打印' : '手动打印',
 	},
 	{
     prop: 'remark',
@@ -71,17 +71,16 @@ export default {
 							btnName: '编辑',
 					  }
           : undefined,
-        {
-          type: 'print',
-          btnName: '打印',
-        },
         this.$auth.hasPermi(`base:packaging-print-model:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
           : undefined,
-
+        {
+          type: 'print',
+          btnName: '查看',
+        },
 			].filter((v) => v),
 			tableData: [],
 			formConfig: [
@@ -102,12 +101,12 @@ export default {
         //   valueFormat: 'yyyy-MM-dd',
         //   param: 'createTime',
 				// },
-				{
-					type: 'button',
-					btnName: '搜索',
-					name: 'search',
-					color: 'primary',
-				},
+				// {
+				// 	type: 'button',
+				// 	btnName: '搜索',
+				// 	name: 'search',
+				// 	color: 'primary',
+				// },
 				// {
 				// 	type: 'separate',
 				// },
@@ -121,7 +120,7 @@ export default {
 				},
 				{
           type: this.$auth.hasPermi('base:packaging-print-model:create') ? 'button' : '',
-					btnName: '新增',
+					btnName: '新增模板',
 					name: 'add',
 					color: 'success',
 					plain: true,