Merge pull request 'zhp' (#15) from zhp into master

Reviewed-on: #15

src/i18n/zh-CN.js

@@ -354,6 +354,14 @@ t.quality.productName = '检验产品'
 t.quality.transferTime =	'转移时间'
 t.quality.inspectionType = '检验类型'
 t.quality.measuringTools = '量具'
+t.quality.sampleRangeLow = '取样范围低'
+t.quality.sampleRangeHigh = '取样范围高'
+t.quality.inspectionLevel = '检验水平'
+t.quality.sampleSizeCode = '样本量字码'
+t.quality.sampleSize = '样本量'
+
+	
+	
 
 
 

src/mixins/basic-search.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zhp
- * @LastEditTime: 2023-02-24 16:16:54
+ * @LastEditTime: 2023-07-10 14:35:06
  * @Description: 
  */
 export default {
@@ -72,7 +72,7 @@ export default {
       });
     },
     handleSearchReset() {
-      this.$refs.addOrUpdate.formClear();
+      this.$refs.searchOrUpdate.formClear();
     },
     cancel(id) {
       this.$refs["popover-" + id].showPopper = false;

src/views/modules/basic/components/control-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-06 15:25:10
+ * @LastEditTime: 2023-07-10 15:52:48
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -13,8 +13,8 @@
     <el-form-item prop="controlName" :label="$t('basic.name')">
       <el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input>
     </el-form-item>
-    <el-form-item prop="specification" :label="$t('basic.specification')">
+    <el-form-item prop="specifications" :label="$t('basic.specification')">
-      <el-input v-model="dataForm.specification" :placeholder="$t('basic.specification')"></el-input>
+      <el-input v-model="dataForm.specifications" :placeholder="$t('basic.specification')"></el-input>
     </el-form-item>
     <el-form-item prop="incomingInspection" :label="$t('basic.stock')">
       <el-switch v-model="dataForm.incomingInspection" :active-value="1" :inactive-value="0">
@@ -38,6 +38,9 @@
         </el-option>
       </el-select>
     </el-form-item>
+    <el-form-item prop="remark" :label="$t('basic.remark')">
+      <el-input v-model="dataForm.remark" :placeholder="$t('basic.remark')"></el-input>
+    </el-form-item>
   </el-form>
 </template>
 
@@ -71,7 +74,8 @@ export default {
         incomingInspection: null,
         outInspection: null,
         processInspection: null,
-        specification:null
+        specifications: null,
+        remark:null
       },
     };
   },

src/views/modules/basic/components/failureTypeSearch.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-01-04 10:29:40
  * @LastEditors: zhp
- * @LastEditTime: 2023-02-16 15:46:10
+ * @LastEditTime: 2023-07-10 15:41:53
  * @Description: 
 -->
 <template>
@@ -113,7 +113,7 @@ export default {
     //     })
     // },
     handleConditionSearch() {
-      this.$emit("successSubmit", this.dataForm.key);
+      this.$emit("successSubmit", this.dataForm)
     },
     // dataFormSubmitHandle: debounce(
     //   function () {

src/views/modules/basic/components/product-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-06-30 08:57:14
+ * @LastEditTime: 2023-07-10 10:57:16
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -59,7 +59,8 @@ export default {
         productCode:null,
         productName: null,
         productTypeId:null,
-        productTypeStatus:null
+        productTypeStatus: null,
+        productSpecs:null
       },
     };
   },

src/views/modules/basic/qmsCustomerType.vue

@@ -241,7 +241,7 @@ export default {
           this.getDataList();
           break;
         case "export":
-          this.exportHandle();
+          this.exportHandle()
           break;
         case "add":
           this.addOrEditTitle = "新增";

src/views/modules/basic/qmsProduct.vue

@@ -70,11 +70,6 @@ const tableProps = [
     label: i18n.t('basic.InspectionStage'),
     subcomponent: radio,
   },
-  {
-    prop: "controlStatus",
-    label: i18n.t('basic.available'),
-    subcomponent: available,
-  },
   {
     prop: "remark",
     label: i18n.t('schedule.remark'),

src/views/modules/basic/qmsProductType.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-21 14:30:17
- * @LastEditTime: 2023-06-20 15:37:24
+ * @LastEditTime: 2023-07-10 15:38:11
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -9,7 +9,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
-        <el-badge :value="1" class="item">
+        <el-badge :value="3" class="item">
           <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
         </el-badge>
       </SearchBar>

src/views/modules/basic/qmsTeam.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-21 14:30:17
- * @LastEditTime: 2023-06-26 15:32:36
+ * @LastEditTime: 2023-07-10 15:39:29
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -60,7 +60,7 @@
             <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
           </base-dialog>
         </div>
-      </el-col>""
+      </el-col>
     </el-row>
   </el-card>
 </template>
@@ -163,8 +163,8 @@ export default {
         },
         {
           type: "button",
-          btnName: "导出",
+          btnName: i18n.t('export'),
-          name: i18n.t('export'),
+          name: 'export',
           color: "primary",
           // plain: true,
         },
@@ -256,37 +256,36 @@ export default {
       // console.log(11111);
       // this.conditionSearchSubmit();
     },
-    exportHandle() {
+    // exportHandle() {
-      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+    //   console.log(1111)
-        ...this.dataForm
+    //   this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }).then((res) => {
-      }).then((res) => {
+    //     console.log(res)
-        console.log(res)
+    //     // if (res !== 0) {
-        // if (res !== 0) {
+    //     //   return this.$message.error(res.msg) 
-        //   return this.$message.error(res.msg) 
+    //     // }
-        // }
+    //     let fileName = ''
-        let fileName = ''
+    //     const contentDisposition = res.headers['content-disposition']
-        const contentDisposition = res.headers['content-disposition']
+    //     if (contentDisposition) {
-        if (contentDisposition) {
+    //       const temp = res.headers['content-disposition']
-          const temp = res.headers['content-disposition']
+    //         .split(';')[1]
-            .split(';')[1]
+    //         .split('=')[1]
-            .split('=')[1]
+    //       // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
-          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+    //       fileName = decodeURI(temp)
-          fileName = decodeURI(temp)
+    //       console.log(temp)
-          console.log(temp)
+    //     }
-        }
+    //     const blob = new Blob([res.data])
-        const blob = new Blob([res.data])
+    //     const reader = new FileReader()
-        const reader = new FileReader()
+    //     reader.readAsDataURL(blob)
-        reader.readAsDataURL(blob)
+    //     reader.onload = (e) => {
-        reader.onload = (e) => {
+    //       const a = document.createElement('a')
-          const a = document.createElement('a')
+    //       a.download = fileName
-          a.download = fileName
+    //       a.href = e.target.result
-          a.href = e.target.result
+    //       document.body.appendChild(a)
-          document.body.appendChild(a)
+    //       a.click()
-          a.click()
+    //       document.body.removeChild(a)
-          document.body.removeChild(a)
+    //     }
-        }
+    //   }).catch(() => { })
-      }).catch(() => { })
+    // },
-    },
     handleClick(val) {
       console.log(val);
       if (val.type === "delete") {
@@ -368,7 +367,7 @@ export default {
           this.getDataList();
           break;
         case "export":
-          this.exportHandle();
+          this.exportHandle()
           break;
         case "add":
           this.addOrEditTitle = "新增";
@@ -390,7 +389,6 @@ export default {
         //   this.$refs.palletTable1.setCurrent("palletTable", -1);
         //   break;
         default:
-          console.log(val);
       }
     },
   },

src/views/modules/quality/components/InspectionPosition-add.vue

@@ -1,12 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-04 16:17:23
+ * @LastEditTime: 2023-07-10 10:58:44
  * @LastEditors: zhp
  * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="130px">
     <el-form-item prop="inspectionPositionCode" :label="$t('basic.code')">
       <el-input v-model="dataForm.inspectionPositionCode" :placeholder="$t('basic.code')">
       </el-input>
@@ -58,27 +59,20 @@ export default {
   computed: {
     dataRule() {
       return {
-        // dictLabel: [
+        inspectionPositionNumber: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        inspectionPositionCode: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
       };
     },
   },

src/views/modules/quality/components/disposalMethod-add.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-04 16:18:38
+ * @LastEditTime: 2023-07-10 14:27:55
  * @LastEditors: zhp
  * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
     <el-form-item prop="disposalMethodName" :label="$t('quality.disposalMethodName')">
       <el-input v-model="dataForm.disposalMethodName" :placeholder="$t('quality.disposalMethodName')">
       </el-input>
@@ -58,27 +58,20 @@ export default {
   computed: {
     dataRule() {
       return {
-        // dictLabel: [
+        disposalMethodCode: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        disposalMethodName: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ]
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
       };
     },
   },

src/views/modules/quality/components/lowHigh.vue

@@ -0,0 +1,41 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-01-31 09:49:36
+ * @LastEditTime: 2023-07-10 14:18:29
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <span>
+    <span> {{ this.injectData.sampleRangeLow }} </span>~
+    <span> {{ this.injectData.sampleRangeHigh }} </span>
+  </span>
+</template>
+
+<script>
+// import { addDynamicRoute } from '@/router'
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    // 子级
+    // emitClick () {
+    //   // 路由参数
+    //   const routeParams = {
+    //     routeName: `${this.$route.name}__${this.injectData.id}`,
+    //     title: `${this.$route.meta.title} - ${this.injectData.dictType}`,
+    //     path: 'sys/dict-data',
+    //     params: {
+    //       dictTypeId: this.injectData.id
+    //     }
+    //   }
+    //   // 动态路由
+    //   addDynamicRoute(routeParams, this.$router)
+    // }
+  }
+}
+</script>

src/views/modules/quality/components/samplingPlan-add.vue

@@ -1,14 +1,36 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-04 15:44:45
+ * @LastEditTime: 2023-07-10 14:13:18
  * @LastEditors: zhp
  * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
-    <el-form-item prop="sampleRange" :label="$t('quality.sampleRange')">
+    <el-row :gutter="24">
-      <el-input v-model="dataForm.sampleRange" :placeholder="$t('quality.sampleRange')">
+      <el-col :span="12">
+        <el-form-item prop="sampleRangeLow" :label="$t('quality.sampleRangeLow')">
+          <el-input v-model="dataForm.sampleRangeLow" :placeholder="$t('quality.sampleRangeLow')">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="sampleRangeHigh" :label="$t('quality.sampleRangeHigh')">
+          <el-input v-model="dataForm.sampleRangeHigh" :placeholder="$t('quality.sampleRangeHigh')">
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-form-item prop="inspectionLevel" :label="$t('quality.inspectionLevel')">
+      <el-input v-model="dataForm.inspectionLevel" :placeholder="$t('quality.inspectionLevel')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="sampleSizeCode" :label="$t('quality.sampleSizeCode')">
+      <el-input v-model="dataForm.sampleSizeCode" :placeholder="$t('quality.sampleSizeCode')">
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="sampleSize" :label="$t('quality.sampleSize')">
+      <el-input v-model="dataForm.sampleSize" :placeholder="$t('quality.sampleSize')">
       </el-input>
     </el-form-item>
     <el-form-item prop="fourPointZero" :label="$t('quality.fourPointZero')">
@@ -93,11 +115,12 @@ export default {
       }],
       visible: false,
       dataForm: {
-        id: null,
+        id: undefined,
         fourPointZero: null,
         onePointFive:null,	
         onePointZero:null,
-        sampleRange: null,	
+        sampleRangeHigh: null,	
+        sampleRangeLow:null,
         sixPointFive: null,
         ten: null,
         twoPointFive: null,
@@ -107,6 +130,9 @@ export default {
         zeroPointSixFive: null,	
         zeroPointTwoFive: null,
         zeroPointZeroFour: null,
+        inspectionLevel: null,
+        sampleSizeCode: null,
+        sampleSize: null,
         zeroPointZeroOne: null,
         zeroPointZeroOneFive: null,
         zeroPointZeroSixFive: null,
@@ -117,27 +143,34 @@ export default {
   computed: {
     dataRule() {
       return {
-        // dictLabel: [
+        inspectionLevel: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // dictValue: [
+        sampleSizeCode: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
-        // sort: [
+        sampleSize: [
-        //   {
+          {
-        //     required: true,
+            required: true,
-        //     message: this.$t("validate.required"),
+            message: this.$t("validate.required"),
-        //     trigger: "blur",
+            trigger: "blur",
-        //   },
+          },
-        // ],
+        ],
+        sampleRangeLow: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
       };
     },
   },

src/views/modules/quality/components/samplingPlanSearch.vue

@@ -0,0 +1,171 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-01-04 10:29:40
+ * @LastEditors: zhp
+ * @LastEditTime: 2023-07-10 15:19:50
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="sampleSize" :label="$t('quality.sampleSize')">
+      <el-input v-model="dataForm.sampleSize" :placeholder="$t('quality.sampleSize')"></el-input>
+    </el-form-item>
+      <el-form-item prop="inspectionLevel" :label="$t('quality.inspectionLevel')">
+        <el-select v-model="dataForm.inspectionLevel" :placeholder="$t('quality.inspectionLevel')">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+import basicAdd from "@/mixins/basic-add";
+export default {
+  mixins: [basicAdd],
+  data() {
+    return {
+      // urlOptions: {
+      //   submitURL: "/sys/params/",
+      //   infoURL: "/sys/params",
+      // },
+      urlOptions: {
+        getSupplierList: "/supplier/qmsSupplier/page",
+        getProductList: "/basic/qmsProduct/page",
+      },
+      options: [
+        {
+          label: 'S-1',
+          value:'S-1'
+        },
+        {
+          label: 'S-2',
+          value: 'S-2'
+        },
+        {
+          label: 'S-3',
+          value: 'S-3'
+        },
+        {
+          label: 'S-4',
+          value: 'S-4'
+        },
+        {
+          label: 'Ⅰ',
+          value: 'Ⅰ'
+        },
+        {
+          label: 'Ⅱ',
+          value: 'Ⅱ'
+        },
+        {
+          label: 'Ⅲ',
+          value: 'Ⅲ'
+        }
+      ],
+      visible: false,
+      customerTypeList:{},
+      dataForm: {
+        sampleSize: null,
+        inspectionLevel:null,
+      }
+    };
+  },
+  computed: {
+    // dataRule() {
+    //   return {
+    //     paramCode: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //     paramValue: [
+    //       {
+    //         required: true,
+    //         message: this.$t("validate.required"),
+    //         trigger: "blur",
+    //       },
+    //     ],
+    //   };
+    // },
+  },
+  methods: {
+    // init(id) {
+    //   this.dataForm.id = id || "";
+    //   this.visible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs["dataForm"].resetFields();
+    //     if (this.dataForm.id) {
+    //       this.getInfo();
+    //     }
+    //   });
+    // },
+    // 获取信息
+    // getInfo() {
+    //   this.$http
+    //     .get(`/sys/params/${this.dataForm.id}`)
+    //     .then(({ data: res }) => {
+    //       if (res.code !== 0) {
+    //         return this.$message.error(res.msg);
+    //       }
+    //       this.dataForm = {
+    //         ...this.dataForm,
+    //         ...res.data,
+    //       };
+    //     })
+    //     .catch(() => {});
+    // },
+    // 表单提交
+    // getDict() {
+    //   this.$http
+    //     .get(this.urlOptions.getCustomerPageListURL, {
+    //       params: this.listQuery,
+    //     })
+    //     .then(({ data: res }) => {
+    //       this.dataListLoading = false;
+    //       if (res.code !== 0) {
+    //         this.customerTypeList = res.data
+    //       }
+    //     })
+    // },
+    handleConditionSearch() {
+      this.$emit("successSubmit", this.dataForm)
+    },
+    // dataFormSubmitHandle: debounce(
+    //   function () {
+    //     // console.log(1111);
+    //     // this.visible = false;
+    //     this.$emit("successSubmit", this.dataForm.key);
+    //     // this.$refs["dataForm"].validate((valid) => {
+    //     //   if (!valid) {
+    //     //     return false;
+    //     //   }
+    //     //   this.$http[!this.dataForm.id ? "post" : "put"](
+    //     //     "/sys/params",
+    //     //     this.dataForm
+    //     //   )
+    //     //     .then(({ data: res }) => {
+    //     //       if (res.code !== 0) {
+    //     //         return this.$message.error(res.msg);
+    //     //       }
+    //     //       this.$message({
+    //     //         message: this.$t("prompt.success"),
+    //     //         type: "success",
+    //     //         duration: 500,
+    //     //         onClose: () => {
+
+    //     //         },
+    //     //       });
+    //     //     })
+    //     //     .catch(() => {});
+    //     // });
+    //   },
+    //   1000,
+    //   { leading: true, trailing: false }
+    // ),
+  },
+};
+</script>

src/views/modules/quality/components/transferRecords-add.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-06 15:58:51
+ * @LastEditTime: 2023-07-10 11:08:31
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -46,6 +46,9 @@
     <el-form-item prop="dataSources" :label="$t('quality.dataSources')">
       <el-input v-model="dataForm.dataSources" :placeholder="$t('quality.dataSources')"></el-input>
     </el-form-item>
+    <el-form-item prop="remark" :label="$t('quality.remark')">
+      <el-input v-model="dataForm.remark" :placeholder="$t('quality.remark')"></el-input>
+    </el-form-item>
   </el-form>
 </template>
 
@@ -170,6 +173,7 @@ export default {
         transferInId: null,
         transferInName: null,
         transferOutId: null,
+        remark:null
       },
     };
   },

src/views/modules/quality/components/transferSchemeSearch.vue

@@ -2,16 +2,16 @@
  * @Author: zwq
  * @Date: 2023-01-04 10:29:40
  * @LastEditors: zhp
- * @LastEditTime: 2023-07-06 16:32:10
+ * @LastEditTime: 2023-07-10 11:01:12
  * @Description: 
 -->
 <template>
   <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
     <el-form-item prop="name" :label="$t('basic.name')">
-      <el-input v-model="dataForm.transferSchemeName" :placeholder="$t('basic.name')"></el-input>
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')"></el-input>
     </el-form-item>
     <el-form-item prop="code" :label="$t('basic.code')">
-      <el-input v-model="dataForm.transferSchemeCode" :placeholder="$t('basic.code')"></el-input>
+      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')"></el-input>
     </el-form-item>
   </el-form>
 </template>

src/views/modules/quality/qmsCustomSampling.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-06 15:37:26
+ * @LastEditTime: 2023-07-10 14:48:12
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -13,7 +13,7 @@
           <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
         </el-badge>
       </SearchBar>
-      <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
+      <base-table  :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
         <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
           @clickBtn="handleClick" />
       </base-table>
@@ -60,6 +60,11 @@ const tableProps = [
     label: i18n.t("basic.code"),
     align: 'center'
   },
+  {
+    prop: 'customSamplingName',
+    label: i18n.t("quality.name"),
+    align: 'center'
+  },
   {
     prop: 'planCategory',
     label: i18n.t("quality.planCategory"),
@@ -131,6 +136,7 @@ const tableProps = [
   {
     prop: 'total',
     label: i18n.t("quality.total"),
+    align: 'center',
     children: [
       {
         prop: 'totalAcceptable',
@@ -148,7 +154,7 @@ const tableProps = [
 const tableBtn = [
   {
     type: "edit",
-    btnName: "编辑",
+    btnName: "编辑"
   },
   {
     type: "delete",

src/views/modules/quality/qmsSamplingPlan.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-06-02 13:53:43
+ * @LastEditTime: 2023-07-10 15:21:22
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -9,9 +9,9 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
-        <!-- <el-badge :value="1" class="item">
+        <el-badge :value="2" class="item">
           <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
-        </el-badge> -->
+        </el-badge>
       </SearchBar>
       <base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
         <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
@@ -23,12 +23,12 @@
       <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
         @confirm="handleConfirm" :before-close="handleCancel">
         <samplingPlan-add ref="addOrUpdate" @refreshDataList="successSubmit">
-          </samplingPlan-add>
+        </samplingPlan-add>
-          <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
+        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
       </base-dialog>
       <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
         @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
-        <!-- <failureType-search ref="searchOrUpdate" @refreshDataList="conditionSearchSubmit"></failureType-search> -->
+        <samplingPlan-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></samplingPlan-search>
         <el-row slot="footer" type="flex" justify="end">
           <el-col :span="12">
             <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
@@ -50,49 +50,40 @@
 import basicPage from "@/mixins/basic-page"
 import samplingPlanAdd from "./components/samplingPlan-add"
 // import AddOrUpdate from './params-add-or-update'
-// import failureTypeSearch from "./components/failureTypeSearch"
+import samplingPlanSearch from "./components/samplingPlanSearch.vue"
-// import available from "./components/available.vue"
+import lowHigh from "./components/lowHigh.vue"
 import basicSearch from "@/mixins/basic-search"
 import i18n from "@/i18n"
 const tableProps = [
   {
     prop: 'sampleRange',
     label: i18n.t("quality.sampleRange"),
+    align: 'center',
+    subcomponent: lowHigh,
+  },
+  {
+    prop: 'zeroPointZeroOne',
+    label: i18n.t("quality.zeroPointZeroOne"),
     align: 'center'
   },
   {
-    prop: 'fourPointZero',
+    prop: 'zeroPointZeroOneFive',
-    label: i18n.t("quality.fourPointZero"),
+    label: i18n.t("quality.zeroPointZeroOneFive"),
     align: 'center'
   },
   {
-    prop: 'onePointFive',
+    prop: 'zeroPointZeroTwoFive',
-    label: i18n.t("quality.onePointFive"),
+    label: i18n.t("quality.zeroPointZeroTwoFive"),
-    align: 'center'
-  },
-   {
-     prop: 'onePointZero',
-     label: i18n.t("quality.onePointZero"),
     align: 'center'
   },
   {
-    prop: 'sixPointFive',
+    prop: 'zeroPointZeroFour',
-    label: i18n.t("quality.sixPointFive"),
+    label: i18n.t("quality.zeroPointZeroFour"),
-    align: 'center'
-  },
-   {
-     prop: 'ten',
-     label: i18n.t("quality.ten"),
     align: 'center'
   },
   {
-    prop: 'twoPointFive',
+    prop: 'zeroPointZeroSixFive',
-    label: i18n.t("quality.twoPointFive"),
+    label: i18n.t("quality.zeroPointZeroSixFive"),
-    align: 'center'
-  },
-  {
-    prop: 'zeroPointFour',
-    label: i18n.t("quality.zeroPointFour"),
     align: 'center'
   },
   {
@@ -105,41 +96,52 @@ const tableProps = [
     label: i18n.t("quality.zeroPointOneFive"),
     align: 'center'
   },
-  {
-    prop: 'zeroPointSixFive',
-    label: i18n.t("quality.zeroPointSixFive"),
-    align: 'center'
-  },
   {
     prop: 'zeroPointTwoFive',
     label: i18n.t("quality.zeroPointTwoFive"),
     align: 'center'
   },
   {
-    prop: 'zeroPointZeroFour',
+    prop: 'zeroPointFour',
-    label: i18n.t("quality.zeroPointZeroFour"),
+    label: i18n.t("quality.zeroPointFour"),
     align: 'center'
   },
   {
-    prop: 'zeroPointZeroOne',
+    prop: 'zeroPointSixFive',
-    label: i18n.t("quality.zeroPointZeroOne"),
+    label: i18n.t("quality.zeroPointSixFive"),
     align: 'center'
   },
   {
-    prop: 'zeroPointZeroOneFive',
+    prop: 'onePointZero',
-    label: i18n.t("quality.zeroPointZeroOneFive"),
+    label: i18n.t("quality.onePointZero"),
     align: 'center'
   },
   {
-    prop: 'zeroPointZeroSixFive',
+    prop: 'onePointFive',
-    label: i18n.t("quality.zeroPointZeroSixFive"),
+    label: i18n.t("quality.onePointFive"),
     align: 'center'
   },
   {
-    prop: 'zeroPointZeroTwoFive',
+    prop: 'twoPointFive',
-    label: i18n.t("quality.zeroPointZeroTwoFive"),
+    label: i18n.t("quality.twoPointFive"),
     align: 'center'
   },
+  {
+    prop: 'fourPointZero',
+    label: i18n.t("quality.fourPointZero"),
+    align: 'center'
+  },
+  {
+    prop: 'sixPointFive',
+    label: i18n.t("quality.sixPointFive"),
+    align: 'center'
+  },
+   {
+     prop: 'ten',
+     label: i18n.t("quality.ten"),
+    align: 'center'
+  },
+
 ]
 const tableBtn = [
   {
@@ -154,7 +156,7 @@ const tableBtn = [
 export default {
   mixins: [basicPage, basicSearch],
   components: {
-    // failureTypeSearch,
+    samplingPlanSearch,
     samplingPlanAdd
   },
   data() {
@@ -195,6 +197,10 @@ export default {
   // components: {
   //   AddOrUpdate,
   // },
+  deactivated() {
+    this.listQuery.inspectionLevel = null
+    this.listQuery.sampleSize = null
+  },
   methods: {
     //search-bar点击
     handleProductCancel() {
@@ -213,7 +219,8 @@ export default {
       });
     },
     conditionSearchSubmit(dataForm) {
-      this.listQuery.code = dataForm.code
+      this.listQuery.inspectionLevel = dataForm.inspectionLevel
+      this.listQuery.sampleSize = dataForm.sampleSize
       this.listQuery.page = 1;
       this.getDataList();
       this.searchOrUpdateVisible = false;
@@ -258,7 +265,8 @@ export default {
         case "search":
           // this.listQuery.paramCode = val.paramCode;
           this.listQuery.page = 1;
-          this.listQuery.failureTypeStatus = null
+          this.listQuery.inspectionLevel = null
+          this.listQuery.sampleSize = null
           this.getDataList();
           break;
         case "add":

src/views/modules/quality/qmsTransferRecords.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-06 16:33:15
+ * @LastEditTime: 2023-07-10 11:17:36
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -9,7 +9,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
-        <el-badge :value="1" class="item">
+        <el-badge :value="5" class="item">
           <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
         </el-badge>
       </SearchBar>
@@ -144,9 +144,14 @@ export default {
       ],
     };
   },
-  // components: {
+  deactivated() {
-  //   AddOrUpdate,
+    this.listQuery.startTime =null
-  // },
+    this.listQuery.endTime = null
+    this.listQuery.inspectionStage = null
+    this.listQuery.inspectionTypeId = null
+    this.listQuery.productId = null
+    this.listQuery.supplierId = null
+  },
   methods: {
     //search-bar点击
     handleProductCancel() {

src/views/modules/quality/qmsTransferScheme.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-06 16:32:40
+ * @LastEditTime: 2023-07-10 11:02:37
  * @LastEditors: zhp
  * @Description: 
 -->
@@ -9,7 +9,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
-        <el-badge :value="1" class="item">
+        <el-badge :value="2" class="item">
           <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
         </el-badge>
       </SearchBar>
@@ -147,9 +147,10 @@ export default {
       ],
     };
   },
-  // components: {
+  deactivated() {
-  //   AddOrUpdate,
+    this.listQuery.name = null
-  // },
+    this.listQuery.code = null
+  },
   methods: {
     //search-bar点击
     handleProductCancel() {