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

Reviewed-on: #17
Merge branch 'master' into zhp
2023-07-13 08:40:12 +08:00 · 2023-07-13 08:36:09 +08:00 · 2023-07-13 08:35:26 +08:00
39 changed files with 1195 additions and 568 deletions
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@ -371,6 +371,7 @@ t.quality.sampleSize = '样本量'

 t.disqualification = {}
 t.disqualification.inspectionTypeId = '检验类型'
+t.disqualification.name = '名称'
 t.disqualification.productTypeName = '产品类型'
 t.disqualification.productName = '产品名称'
 t.disqualification.teamName = '处置团队'
@ -388,7 +389,6 @@ t.disqualification.disposalMethod = '处置方法'
 t.disqualification.disposalTime = '处置时间'
 t.disqualification.remark = '备注'
 t.disqualification.approvalProcessCode = '编号'
-t.disqualification.approvalProcessName = '名称'
 t.disqualification.approvalProcessType = '类型'
 t.disqualification.description = '描述'
 t.disqualification.step = '步骤'
--- a/src/views/modules/basic/components/control-add.vue
+++ b/src/views/modules/basic/components/control-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-10 15:52:48
+ * @LastEditTime: 2023-07-12 13:49:47
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="controlCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.controlCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -82,25 +82,25 @@ export default {
  computed: {
    dataRule() {
      return {
-        dictLabel: [
+        controlCode: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
-        dictValue: [
+        controlName: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
-        sort: [
+        controlStatus: [
          {
            required: true,
            message: this.$t("validate.required"),
-            trigger: "blur",
+            trigger: "change",
          },
        ],
      };
--- a/src/views/modules/basic/components/customer-add.vue
+++ b/src/views/modules/basic/components/customer-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-02-24 14:58:53
+ * @LastEditTime: 2023-07-12 13:57:14
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="customerCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.customerCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -67,27 +67,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        customerCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        customerName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        customerTypeStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/basic/components/customerType-add.vue
+++ b/src/views/modules/basic/components/customerType-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-02-24 14:59:19
+ * @LastEditTime: 2023-07-12 13:55:20
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
    label-width="120px">
    <el-form-item prop="customerTypeCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.customerTypeCode" :placeholder="$t('basic.code')"></el-input>
@ -55,25 +55,25 @@ export default {
  computed: {
    dataRule() {
      return {
-        dictLabel: [
+        customerTypeCode: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
-        dictValue: [
+        customerTypeName: [
          {
            required: true,
            message: this.$t("validate.required"),
            trigger: "blur",
          },
        ],
-        sort: [
+        customerTypeStatus: [
          {
            required: true,
            message: this.$t("validate.required"),
-            trigger: "blur",
+            trigger: "change",
          },
        ],
      };
--- a/src/views/modules/basic/components/failureType-add.vue
+++ b/src/views/modules/basic/components/failureType-add.vue
@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-02-24 14:56:56
+ * @LastEditTime: 2023-07-12 13:52:25
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="120px">
    <el-form-item prop="failureTypeCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.failureTypeCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -54,27 +55,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        failureTypeCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        failureTypeName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        failureTypeStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/basic/components/product-add.vue
+++ b/src/views/modules/basic/components/product-add.vue
@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-10 10:57:16
+ * @LastEditTime: 2023-07-12 13:57:47
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="120px">
    <el-form-item prop="productCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.productCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -67,27 +68,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        productCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        productName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        productTypeStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/basic/components/productType-add.vue
+++ b/src/views/modules/basic/components/productType-add.vue
@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-02-24 14:59:37
+ * @LastEditTime: 2023-07-12 14:04:19
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="120px">
    <el-form-item prop="productTypeCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.productTypeCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -54,27 +55,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        productTypeCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        productTypeName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        productTypeStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/basic/components/team-add.vue
+++ b/src/views/modules/basic/components/team-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-21 16:42:11
- * @LastEditTime: 2023-02-24 15:08:39
+ * @LastEditTime: 2023-07-12 14:04:44
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="teamCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.teamCode" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -57,27 +57,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        teamCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        teamName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        sort: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/mutual/components/approvalProcess-add.vue
+++ b/src/views/modules/mutual/components/approvalProcess-add.vue
@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-07 15:48:03
+ * @LastEditTime: 2023-07-12 14:46:40
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
  <div>
-    <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+    <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
      <el-form-item prop="approvalProcessCode" :label="$t('disqualification.approvalProcessCode')">
        <el-input v-model="dataForm.approvalProcessCode" :placeholder="$t('disqualification.approvalProcessCode')">
        </el-input>
@ -101,27 +101,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        approvalProcessCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        approvalProcessName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ]
      };
    },
  },
--- a/src/views/modules/mutual/components/approvalProcessConfiguration-add.vue
+++ b/src/views/modules/mutual/components/approvalProcessConfiguration-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-07 14:06:27
+ * @LastEditTime: 2023-07-12 15:06:16
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
    <el-form-item prop="inspectionTypeId" :label="$t('disqualification.inspectionTypeId')">
      <el-select v-model="dataForm.inspectionTypeId" :placeholder="$t('disqualification.inspectionTypeId')">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@ -149,27 +149,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        approvalProcessId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        disposalMethod: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        inspectionTypeId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/mutual/components/approvalProcessConfigurationSearch.vue
+++ b/src/views/modules/mutual/components/approvalProcessConfigurationSearch.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2023-01-04 10:29:40
 * @LastEditors: zhp
- * @LastEditTime: 2023-04-07 10:16:09
+ * @LastEditTime: 2023-07-12 14:54:19
 * @Description: 
 -->
 <template>
@ -24,7 +24,7 @@

 <script>
 import debounce from "lodash/debounce";
-import basicAdd from "@/mixins/basic-add";
+import basicAdd from "@/mixins/basic-add"; 
 export default {
  mixins: [basicAdd],
  data() {
@ -150,7 +150,7 @@ export default {
          }
        })
        .catch(() => {
-        });
+        })
    },
    // init(id) {
    //   this.dataForm.id = id || "";
--- a/src/views/modules/mutual/qmsApprovalProcess.vue
+++ b/src/views/modules/mutual/qmsApprovalProcess.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-07 09:20:18
+ * @LastEditTime: 2023-07-12 15:02:56
 * @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="2" 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"
@ -66,7 +66,7 @@ const tableProps = [
  },
  {
    prop: 'approvalProcessName',
-    label: i18n.t("disqualification.approvalProcessName"),
+    label: i18n.t("disqualification.name"),
    align: 'center'
  },
  {
@ -114,26 +114,34 @@ export default {
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
        {
-          type: "button",
-          btnName: i18n.t('add'),
-          name: "add",
-          color: "primary",
+          type: 'input',
+          label: i18n.t('quality.code'),
+          placeholder: i18n.t('quality.code'),
+          param: 'code',
+          clearable: true
+        },
+        {
+          type: 'input',
+          label: i18n.t('quality.name'),
+          placeholder: i18n.t('quality.name'),
+          param: 'name',
+          clearable: true
        },
        {
          type: "button",
-          btnName: i18n.t('search'),
+          btnName: "新增",
+          name: "add",
+          color: 'success',
+          plain: true
+          // plain: true,
+        },
+        {
+          type: "button",
+          btnName: "搜索",
          name: "search",
          color: "primary",
+          // plain: true,
        }
      ],
    };
@ -205,6 +213,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1
+          this.listQuery.code = val.code ? val.code  : null
+          this.listQuery.name = val.name ? val.name :null
          this.getDataList();
          break;
        case "export":
--- a/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue
+++ b/src/views/modules/mutual/qmsApprovalProcessConfiguration.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-07 14:23:29
+ * @LastEditTime: 2023-07-12 14:57:28
 * @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="2" 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"
@ -102,26 +102,102 @@ export default {
      urlOptions: {
        getDataListURL: "/nonconform/qmsApprovalProcessConfiguration/page",
        deleteURL: "/nonconform/qmsApprovalProcessConfiguration",
+        getProductURL: '/basic/qmsProduct/page'
      },
      tableProps,
      tableBtn,
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'select',
+          label: i18n.t('disqualification.inspectionTypeId'),
+          placeholder: i18n.t('disqualification.inspectionTypeId'),
+          param: 'inspectionTypeId',
+          selectOptions: [
+            {
+              id: 0,
+              name: '监控'
+            },
+            {
+              id: 1,
+              name: '电芯来料检验'
+            },
+            {
+              id: 2,
+              name: 'IQC抽检'
+            },
+            {
+              id: 3,
+              name: 'IQC抽检2'
+            },
+            {
+              id: 4,
+              name: '原料抽检'
+            },
+            {
+              id: 5,
+              name: '进货外观检验'
+            },
+            {
+              id: 6,
+              name: '库内原料检验'
+            },
+            {
+              id: 7,
+              name: '来料检验'
+            },
+            {
+              id: 8,
+              name: '胶片'
+            },
+            {
+              id: 9,
+              name: '抽检'
+            },
+            {
+              id: 10,
+              name: '巡检'
+            },
+            {
+              id: 11,
+              name: '首检'
+            },
+            {
+              id: 12,
+              name: '末检'
+            },
+            {
+              id: 13,
+              name: '实时监测'
+            },
+            {
+              id: 14,
+              name: 'FQC抽检'
+            },
+            {
+              id: 15,
+              name: 'OQC抽检'
+            },
+          ],
+          clearable: true,
+          filterable: true
+        },
+        {
+          type: 'select',
+          label: i18n.t('disqualification.productName'),
+          placeholder: i18n.t('disqualification.productName'),
+          param: 'productId',
+          selectOptions: [],
+          clearable: true,
+          filterable: true
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: 'success',
+          plain: true
        },
        {
          type: "button",
@ -135,11 +211,29 @@ export default {
  // components: {
  //   AddOrUpdate,
  // },
-  deactivated () {
-    this.listQuery.inspectionTypeId = null
-    this.listQuery.productId = null
+  mounted() {
+    this.getData();
  },
  methods: {
+    getData() {
+      this.$http
+        .get(this.urlOptions.getProductURL, {
+          params: this.listQuery,
+        })
+        .then(({ data: res }) => {
+          if (res.code === 0) {
+            console.log(res.data)
+            this.formConfig[1].selectOptions = res.data.list.map((item) => {
+              return {
+                id: item.id,
+                name: item.productName
+              }
+            })
+          }
+        })
+        .catch(() => {
+        })
+    },
    //search-bar点击
    handleProductCancel() {
      this.productOrUpdateVisible = false;
@ -203,8 +297,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.inspectionTypeId = null
-          this.listQuery.productId = null
+          this.listQuery.inspectionTypeId = val.inspectionTypeId ? val.inspectionTypeId : null
+          this.listQuery.productId = val.productId ? val.productId :null
          this.getDataList();
          break;
        case "add":
--- a/src/views/modules/nonconform/components/approvalDispositionTeamConfiguration-add.vue
+++ b/src/views/modules/nonconform/components/approvalDispositionTeamConfiguration-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-06 15:12:57
+ * @LastEditTime: 2023-07-12 15:12:31
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="150px">
    <el-form-item prop="inspectionTypeId" :label="$t('disqualification.inspectionTypeId')">
      <el-select v-model="dataForm.inspectionTypeId" :placeholder="$t('disqualification.inspectionTypeId')">
        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@ -123,27 +123,13 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        teamId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ]
      };
    },
  },
--- a/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue
+++ b/src/views/modules/nonconform/qmsApprovalDispositionTeamConfiguration.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-07 14:11:27
+ * @LastEditTime: 2023-07-12 15:08:51
 * @LastEditors: zhp
 * @Description: 
 -->
@ -114,7 +114,8 @@ export default {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: 'success',
+          plain: true
        },
        {
          type: "button",
--- a/src/views/modules/quality/components/InspectionPosition-add.vue
+++ b/src/views/modules/quality/components/InspectionPosition-add.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-10 10:58:44
+ * @LastEditTime: 2023-07-12 14:39:06
 * @LastEditors: zhp
 * @Description: 
 -->
@ -73,6 +73,13 @@ export default {
            trigger: "blur",
          },
        ],
+        inspectionPositionName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/quality/components/customSampling-add.vue
+++ b/src/views/modules/quality/components/customSampling-add.vue
@ -6,7 +6,7 @@
 * @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="customSamplingCode" :label="$t('basic.code')">
      <el-input v-model="dataForm.customSamplingCode" :placeholder="$t('basic.code')">
      </el-input>
@ -131,27 +131,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        customSamplingCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        customSamplingName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ]
      };
    },
  },
--- a/src/views/modules/quality/components/samplingPlan-add.vue
+++ b/src/views/modules/quality/components/samplingPlan-add.vue
@ -1,12 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-10 14:13:18
+ * @LastEditTime: 2023-07-12 14:28:44
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="130px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()"
+    label-width="130px">
    <el-row :gutter="24">
      <el-col :span="12">
        <el-form-item prop="sampleRangeLow" :label="$t('quality.sampleRangeLow')">
@ -22,8 +23,10 @@
      </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-select v-model="dataForm.inspectionLevel" :placeholder="$t('quality.inspectionLevel')">
+        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+        </el-option>
+      </el-select>
    </el-form-item>
    <el-form-item prop="sampleSizeCode" :label="$t('quality.sampleSizeCode')">
      <el-input v-model="dataForm.sampleSizeCode" :placeholder="$t('quality.sampleSizeCode')">
@ -114,6 +117,36 @@ export default {
        label: '可用'
      }],
      visible: false,
+      options: [
+        {
+          id: 'S-1',
+          name: 'S-1'
+        },
+        {
+          id: 'S-2',
+          name: 'S-2'
+        },
+        {
+          id: 'S-3',
+          name: 'S-3'
+        },
+        {
+          id: 'S-4',
+          name: 'S-4'
+        },
+        {
+          id: 'Ⅰ',
+          name: 'Ⅰ'
+        },
+        {
+          id: 'Ⅱ',
+          name: 'Ⅱ'
+        },
+        {
+          id: 'Ⅲ',
+          name: 'Ⅲ'
+        }
+      ],
      dataForm: {
        id: undefined,
        fourPointZero: null,
--- a/src/views/modules/quality/components/transferRecords-add.vue
+++ b/src/views/modules/quality/components/transferRecords-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-11 15:33:25
+ * @LastEditTime: 2023-07-12 14:34:59
 * @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="inspectionStage" :label="$t('quality.inspectionStage')">
      <el-select v-model="dataForm.inspectionStage" :placeholder="$t('quality.inspectionStage')">
        <el-option v-for="item in inspectionStageList" :key="item.id" :label="item.name" :value="item.id">
@ -189,27 +189,48 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        inspectionStage: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        inspectionType: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        supplierId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        productId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        transferInId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        transferOutId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/quality/qmsCustomSampling.vue
+++ b/src/views/modules/quality/qmsCustomSampling.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-10 14:48:12
+ * @LastEditTime: 2023-07-12 14:30:40
 * @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="1" 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"
@ -178,20 +178,19 @@ export default {
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('basic.code'),
+          placeholder: i18n.t('basic.code'),
+          param: 'customSamplingCode',
+          clearable: true
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: "success",
+          plain: true
        },
        {
          type: "button",
@ -273,8 +272,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.key = null
-          this.getDataList();
+          this.listQuery.key = val.customSamplingCode ? val.val.customSamplingCode :null
+          this.getDataList()
          break;
        case "add":
          this.addOrEditTitle = this.$t('add')
--- a/src/views/modules/quality/qmsInspectionPosition.vue
+++ b/src/views/modules/quality/qmsInspectionPosition.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-06 16:28:17
+ * @LastEditTime: 2023-07-12 14:43:09
 * @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="2" 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"
@ -100,20 +100,26 @@ export default {
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('quality.code'),
+          placeholder: i18n.t('quality.code'),
+          param: 'code',
+          clearable: true
+        },
+        {
+          type: 'input',
+          label: i18n.t('quality.name'),
+          placeholder: i18n.t('quality.name'),
+          param: 'name',
+          clearable: true
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: "success",
+          plain: true
        },
        {
          type: "button",
@ -147,7 +153,6 @@ export default {
    conditionSearchSubmit(dataForm) {
      this.listQuery.code = dataForm.code
      this.listQuery.name = dataForm.name
-
      this.listQuery.page = 1;
      this.getDataList();
      this.searchOrUpdateVisible = false;
@ -192,8 +197,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.name = null
-          this.listQuery.code = null
+          this.listQuery.code = val.code ? val.code : null
+          this.listQuery.name = val.name ? val.name : null
          this.getDataList();
          break;
        case "add":
--- a/src/views/modules/quality/qmsSamplingPlan.vue
+++ b/src/views/modules/quality/qmsSamplingPlan.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-10 15:21:22
+ * @LastEditTime: 2023-07-12 14:22:56
 * @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="2" 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"
@ -169,27 +169,67 @@ export default {
      tableBtn,
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
+      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('quality.sampleSize'),
+          placeholder: i18n.t('quality.sampleSize'),
+          param: 'sampleSize',
+          clearable: true
+        },
+        {
+          type: 'select',
+          label: i18n.t('quality.inspectionLevel'),
+          placeholder: i18n.t('quality.inspectionLevel'),
+          param: 'inspectionLevel',
+          selectOptions: [
+            {
+              id: 'S-1',
+              name: 'S-1'
+            },
+            {
+              id: 'S-2',
+              name: 'S-2'
+            },
+            {
+              id: 'S-3',
+              name: 'S-3'
+            },
+            {
+              id: 'S-4',
+              name: 'S-4'
+            },
+            {
+              id: 'Ⅰ',
+              name: 'Ⅰ'
+            },
+            {
+              id: 'Ⅱ',
+              name: 'Ⅱ'
+            },
+            {
+              id: 'Ⅲ',
+              name: 'Ⅲ'
+            }
+          ],
+          clearable: true,
+          filterable: true
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: 'success',
+          plain: true
+          // plain: true,
        },
        {
          type: "button",
          btnName: "搜索",
          name: "search",
          color: "primary",
+          // plain: true,
        }
      ],
    };
@ -265,8 +305,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.inspectionLevel = null
-          this.listQuery.sampleSize = null
+          this.listQuery.inspectionLevel = val.inspectionLevel ? val.inspectionLevel :null
+          this.listQuery.sampleSize = val.sampleSize ? val.sampleSize :null
          this.getDataList();
          break;
        case "add":
--- a/src/views/modules/quality/qmsTransferRecords.vue
+++ b/src/views/modules/quality/qmsTransferRecords.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-10 11:17:36
+ * @LastEditTime: 2023-07-12 14:30:03
 * @LastEditors: zhp
 * @Description: 
 -->
@ -133,7 +133,8 @@ export default {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: "success",
+          plain: true
        },
        {
          type: "button",
--- a/src/views/modules/quality/qmsTransferScheme.vue
+++ b/src/views/modules/quality/qmsTransferScheme.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-10 11:02:37
+ * @LastEditTime: 2023-07-12 14:32:41
 * @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="2" 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"
@ -123,20 +123,26 @@ export default {
      searchOrEditTitle: '',
      searchOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('basic.name'),
+          placeholder: i18n.t('basic.name'),
+          param: 'name',
+          clearable: true
+        },
+        {
+          type: 'input',
+          label: i18n.t('basic.code'),
+          placeholder: i18n.t('basic.code'),
+          param: 'code',
+          clearable: true
+        },
        {
          type: "button",
          btnName: "新增",
          name: "add",
-          color: "primary",
+          color: "success",
+          plain: true
        },
        {
          type: "button",
@ -147,10 +153,6 @@ export default {
      ],
    };
  },
-  deactivated() {
-    this.listQuery.name = null
-    this.listQuery.code = null
-  },
  methods: {
    //search-bar点击
    handleProductCancel() {
@ -215,8 +217,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.code = null
-          this.listQuery.name = null
+          this.listQuery.name = val.name ? val.name : null
+          this.listQuery.code = val.code ? val.code : null
          this.getDataList();
          break;
        case "add":
--- a/src/views/modules/supplier/components/evaluationTask-add.vue
+++ b/src/views/modules/supplier/components/evaluationTask-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-11 16:42:26
+ * @LastEditTime: 2023-07-12 16:16:30
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="evaluationTemplateId" :label="$t('supplier.evaluationTemplateName')">
      <el-select v-model="dataForm.evaluationTemplateId" :placeholder="$t('supplier.evaluationTemplateName')"
        @change="getProductCode">
@ -118,27 +118,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        evaluationTemplateId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        evaluationType: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        title: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/supplier/components/poorLaunch-add.vue
+++ b/src/views/modules/supplier/components/poorLaunch-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-19 14:20:14
+ * @LastEditTime: 2023-07-12 15:46:50
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="productId" :label="$t('supplier.materialName')">
      <el-select v-model="dataForm.productId" :placeholder="$t('supplier.materialName')" @change="getProductCode">
        <el-option v-for="item in productList" :key="item.id" :label="item.productName" :value="item.id">
@ -106,27 +106,55 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        productId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        supplierId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        supplierBatch: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        offlineTime: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change  ",
+          },
+        ],
+        defectiveQuantity: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        undesirablePhenomena: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        productCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/supplier/components/projectType-add.vue
+++ b/src/views/modules/supplier/components/projectType-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-11 14:51:09
+ * @LastEditTime: 2023-07-12 16:19:42
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="code" :label="$t('basic.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -60,27 +60,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        code: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ]
      };
    },
  },
--- a/src/views/modules/supplier/components/qualityAccident-add.vue
+++ b/src/views/modules/supplier/components/qualityAccident-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-18 15:40:53
+ * @LastEditTime: 2023-07-12 15:49:14
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="productId" :label="$t('supplier.materialName')">
      <el-select v-model="dataForm.productId" :placeholder="$t('supplier.materialName')" @change="getProductCode">
        <el-option v-for="item in productList" :key="item.id" :label="item.productName" :value="item.id">
@ -124,6 +124,7 @@ export default {
        causeAnalysis:null,
        closedLoop: null,
        everlastMeasures: null,
+        productCode:null,
        interimMeasures:null,
        lostHour: null,
        place: null,
@ -136,27 +137,41 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        productId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        problemBatch: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        supplierId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        productCode: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        applicationDate: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/supplier/components/supplier-add.vue
+++ b/src/views/modules/supplier/components/supplier-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-11 14:20:48
+ * @LastEditTime: 2023-07-12 15:54:54
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="code" :label="$t('supplier.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('supplier.code')" />
    </el-form-item>
@ -152,6 +152,7 @@ export default {
        name:null,
        address: null,
        abbreviation: null,
+        supplierStatus:null,
        grade: null,
        contact:null,
        contactEmail:null,
@ -165,27 +166,34 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        code: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        ment: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        supplierStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/supplier/components/supplierProduct.vue
+++ b/src/views/modules/supplier/components/supplierProduct.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-11 14:47:45
+ * @LastEditTime: 2023-07-12 15:55:44
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="productId" :label="$t('supplier.productName')">
      <el-select v-model="dataForm.productId" :placeholder="$t('supplier.productName')">
        <el-option v-for="item in productList" :key="item.id" :label="item.productName" :value="item.id">
@ -67,27 +67,20 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        supplierId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+        productId: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ]
      };
    },
  },
--- a/src/views/modules/supplier/components/supplierRequirementListGroup-add.vue
+++ b/src/views/modules/supplier/components/supplierRequirementListGroup-add.vue
@ -0,0 +1,136 @@
+  <!--
+ * @Author: zhp
+ * @Date: 2023-02-14 15:02:26
+ * @LastEditTime: 2023-07-12 16:20:26
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+    <el-form-item prop="name" :label="$t('basic.name')">
+      <el-input v-model="dataForm.name" :placeholder="$t('basic.name')"></el-input>
+    </el-form-item>
+    <!-- <el-form-item prop="productTypeStatus" :label="$t('basic.status')">
+      <el-select v-model="dataForm.productTypeStatus" :placeholder="$t('basic.status')">
+        <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: "/supplier/qmsSupplierRequirementListGroup",
+        infoURL: "/supplier/qmsSupplierRequirementListGroup/{id}"
+        // getTypeListURL: '/basic/qmsProductType/page'
+      },
+      options: [{
+        value: 0,
+        label: '不可用'
+      },
+      {
+        value: 1,
+        label: '可用'
+      }],
+      typeList:[],
+      visible: false,
+      listQuery: {
+        limit: 999,
+        page:1
+      },
+      dataForm: {
+        id: "",
+        code:null,
+        name: null,
+        supplierTypeStatus:null,
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        code: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ]
+      };
+    },
+  },
+  methods: {
+    init(id) {
+      this.dataForm.id = id || ""
+      // this.dataForm.dictTypeId = dictTypeId || "";
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo();
+        } else {
+          // this.getCode()
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/supplier/qmsProjectType/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
+          if (!valid) {
+            return false;
+          }
+          this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, 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: () => {
+                  console.log(1111);
+                  this.visible = false;
+                  this.$emit("successSubmit");
+                },
+              });
+            })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
--- a/src/views/modules/supplier/components/supplierType-add.vue
+++ b/src/views/modules/supplier/components/supplierType-add.vue
@ -1,12 +1,12 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-17 10:56:39
+ * @LastEditTime: 2023-07-12 15:58:36
 * @LastEditors: zhp
 * @Description: 
 -->
 <template>
-  <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+  <el-form :model="dataForm" ref="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
    <el-form-item prop="code" :label="$t('basic.code')">
      <el-input v-model="dataForm.code" :placeholder="$t('basic.code')"></el-input>
    </el-form-item>
@ -66,27 +66,27 @@ export default {
  computed: {
    dataRule() {
      return {
-        // dictLabel: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // dictValue: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
-        // sort: [
-        //   {
-        //     required: true,
-        //     message: this.$t("validate.required"),
-        //     trigger: "blur",
-        //   },
-        // ],
+        code: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        supplierTypeStatus: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
      };
    },
  },
--- a/src/views/modules/supplier/qmsEvaluationPlan.vue
+++ b/src/views/modules/supplier/qmsEvaluationPlan.vue
@ -1,8 +1,8 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-06-28 14:04:45
- * @LastEditors: DY
+ * @LastEditTime: 2023-07-12 16:05:36
+ * @LastEditors: zhp
 * @Description: 评估计划
 -->
 <template>
@ -144,8 +144,8 @@ export default {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
-          color: "primary",
-          // plain: true,
+          color: "success",
+          plain: true
        },
      ],
    };
--- a/src/views/modules/supplier/qmsEvaluationTask.vue
+++ b/src/views/modules/supplier/qmsEvaluationTask.vue
@ -167,7 +167,7 @@ export default {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
-          color: "primary",
+          color: "success",
          // plain: true,
        },
        {
@ -175,7 +175,7 @@ export default {
          btnName: i18n.t('export'),
          name: "export",
          color: "primary",
-          // plain: true,
+          plain: true,
        }
      ],
    };
--- a/src/views/modules/supplier/qmsPoorLaunch.vue
+++ b/src/views/modules/supplier/qmsPoorLaunch.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-06-20 15:38:40
+ * @LastEditTime: 2023-07-12 15:18:25
 * @LastEditors: zhp
 * @Description: 
 -->
@ -173,15 +173,15 @@ export default {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
-          color: "primary",
-          // plain: true,
+          color: "success",
+          plain: true,
        },
        {
          type: "button",
          btnName: i18n.t('export'),
          name: "export",
          color: "primary",
-          // plain: true,
+          plain: true,
        }
      ],
    };
--- a/src/views/modules/supplier/qmsProjectType.vue
+++ b/src/views/modules/supplier/qmsProjectType.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-06-08 14:29:46
- * @LastEditTime: 2023-07-11 14:54:04
+ * @LastEditTime: 2023-07-12 16:03:12
 * @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="2" 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 id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
        :limit="listQuery.limit" :table-data="tableData">
@ -100,20 +100,24 @@ export default {
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('supplier.code'),
+          placeholder: i18n.t('supplier.code'),
+          param: 'code'
+        },
+        {
+          type: 'input',
+          label: i18n.t('supplier.name'),
+          placeholder: i18n.t('supplier.name'),
+          param: 'name'
+        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
-          color: "primary",
+          color: "success",
+          plain:true
        },
        {
          type: "button",
@ -127,7 +131,7 @@ export default {
          btnName: i18n.t('export'),
          name: "export",
          color: "primary",
-          // plain: true,
+          plain: true
        }
      ],
    };
@ -250,6 +254,8 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          // console.log(i18n);
+          this.listQuery.name = val.name ? val.name : null
+          this.listQuery.code = val.code ? val.code : null
          this.listQuery.page = 1
          this.getDataList()
          break;
--- a/src/views/modules/supplier/qmsSupplierProduct.vue
+++ b/src/views/modules/supplier/qmsSupplierProduct.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-04-17 14:23:17
- * @LastEditTime: 2023-06-20 15:38:13
+ * @LastEditTime: 2023-07-12 15:57:57
 * @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="2" 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 id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
        highlight-current-row :limit="listQuery.limit" :table-data="tableData" @current-change="handleCurrentChange">
@ -110,20 +110,18 @@ export default {
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('supplier.supplierName'),
+          placeholder: i18n.t('supplier.supplierName'),
+          param: 'supplierName'
+        },
        {
          type: "button",
          btnName: i18n.t('supplier.supplierRelevance'),
          name: "supplierRelevance",
-          color: "primary",
+          color: "success",
+          plain:true
        },
        {
          type: "button",
@ -220,7 +218,7 @@ export default {
      switch (val.btnName) {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
-          this.listQuery.key = null;
+          this.listQuery.supplierName = val.supplierName ? val.supplierName : null
          // console.log(i18n);
          this.listQuery.page = 1;
          this.getDataList();
--- a/src/views/modules/supplier/qmsSupplierRequirementListGroup.vue
+++ b/src/views/modules/supplier/qmsSupplierRequirementListGroup.vue
@ -0,0 +1,257 @@
+<!--
+ * @Author: zhp
+ * @Date: 2023-06-08 14:29:46
+ * @LastEditTime: 2023-07-12 16:24:41
+ * @LastEditors: zhp
+ * @Description: 
+-->
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-sys__user">
+      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
+        <!-- <el-badge :value="2" class="item">
+          <el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
+        </el-badge> -->
+      </SearchBar>
+      <base-table id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
+        :limit="listQuery.limit" :table-data="tableData">
+        <method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn"
+          @clickBtn="handleClick" />
+      </base-table>
+      <pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total"
+        @pagination="getDataList" />
+      <!-- 弹窗, 新增 / 修改 -->
+      <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
+        @confirm="handleConfirm" :before-close="handleCancel">
+        <supplierRequirementListGroup-add ref="addOrUpdate" @refreshDataList="successSubmit">
+        </supplierRequirementListGroup-add>
+        <!-- <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">
+        <projectType-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit">
+          </projectType-search>
+          <el-row slot="footer" type="flex" justify="end">
+            <el-col :span="12">
+              <el-button size="small" type="primary" plain class="btnTextStyle" @click="handleSearchCancel">
+                {{ $t("close") }}
+              </el-button>
+              <el-button size="small" class="btnTextStyle" type="primary" plain @click="handleSearchReset">{{
+                $t("reset")
+                }}</el-button>
+              <el-button type="primary" size="small" class="btnTextStyle" @click="handleSearchConfirm">
+                {{ $t("search") }}
+              </el-button>
+            </el-col>
+          </el-row>
+      </base-dialog> -->
+    </div>
+  </el-card>
+</template>
+
+<script>
+import basicPage from "@/mixins/basic-page"
+// import basicSearch from "@/mixins/basic-search"
+// import projectTypeSearch from "./components/projectTypeSearch.vue"
+import supplierRequirementListGroupAdd from "./components/supplierRequirementListGroup-add.vue"
+import i18n from "@/i18n"
+// import i18n from "@/i18n";
+const tableProps = [
+  {
+    prop: "name",
+    label: i18n.t('supplier.name'),
+  }
+];
+const tableBtn = [
+  {
+    type: "edit",
+    btnName: i18n.t('edit'),
+  },
+  {
+    type: "delete",
+    btnName: i18n.t('delete'),
+  }
+];
+export default {
+  mixins: [basicPage],
+  data() {
+    return {
+      urlOptions: {
+        getDataListURL: "/supplier/qmsSupplierRequirementListGroup/page",
+        deleteURL: "/supplier/qmsSupplierRequirementListGroup",
+        exportURL: '/supplier/qmsSupplierRequirementListGroup/export',
+        submitURL: '/supplier/qmsSupplierRequirementListGroup'
+      },
+      tableProps,
+      tableBtn,
+      productData: {},
+      dataForm:{
+        limit: 999,
+        page:1
+      },
+      searchOrEditTitle: "",
+      searchOrUpdateVisible: false,
+      productOrEditTitle: "",
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+      productOrUpdateVisible: false,
+      formConfig: [
+        {
+          type: 'input',
+          label: i18n.t('supplier.name'),
+          placeholder: i18n.t('supplier.name'),
+          param: 'name'
+        },
+        {
+          type: "button",
+          btnName: i18n.t('add'),
+          name: "add",
+          color: "success",
+          plain:true
+        },
+        {
+          type: "button",
+          btnName: i18n.t('search'),
+          name: "search",
+          color: "primary",
+          // plain: true,
+        }
+      ],
+    };
+  },
+  components: {
+    supplierRequirementListGroupAdd
+  },
+  methods: {
+    //search-bar点击
+    handleProductCancel() {
+      this.productOrUpdateVisible = false;
+      this.productOrEditTitle = "";
+    },
+    handleCurrentChange(val) {
+      console.log(val);
+      this.productData = val.newVal ? val.newVal : {}
+    },
+    setCurrent(index) {
+      this.$refs.palletTable1.setCurrent("palletTable", index);
+    },
+    // handleSearchCancel() {
+    //   this.searchOrEditTitle = "";
+    //   this.searchOrUpdateVisible = false;
+    // },
+    conditionSearch() {
+      this.searchOrEditTitle = "搜索";
+      this.searchOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.searchOrUpdate.init();
+      });
+    },
+    // handleConfirm() {
+    //   this.$refs.addOrUpdate.dataFormSubmitHandle();
+    // },
+    // conditionSearchSubmit() {},
+    conditionSearchSubmit(dataForm) {
+      // console.log(key);
+      // console.log(key);
+      this.listQuery.name = dataForm.name
+      this.listQuery.code = dataForm.code
+      this.listQuery.page = 1;
+      this.getDataList();
+      this.searchOrUpdateVisible = false;
+      // console.log(11111);
+      // this.conditionSearchSubmit();
+    },
+    exportHandle() {
+      this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
+        ...this.dataForm
+      }).then((res) => {
+        console.log(res)
+        // if (res !== 0) {
+        //   return this.$message.error(res.msg) 
+        // }
+        let fileName = ''
+        const contentDisposition = res.headers['content-disposition']
+        if (contentDisposition) {
+          const temp = res.headers['content-disposition']
+            .split(';')[1]
+            .split('=')[1]
+          // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
+          fileName = decodeURI(temp)
+          console.log(temp)
+        }
+        const blob = new Blob([res.data])
+        const reader = new FileReader()
+        reader.readAsDataURL(blob)
+        reader.onload = (e) => {
+          const a = document.createElement('a')
+          a.download = fileName
+          a.href = e.target.result
+          document.body.appendChild(a)
+          a.click()
+          document.body.removeChild(a)
+        }
+      }).catch(() => { })
+    },
+    handleClick(val) {
+      if (val.type === "delete") {
+        this.$confirm(`确定对[名称=${val.data.customerTypeName}]进行删除操作?`, "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.$http.delete(this.urlOptions.deleteURL, { data: [val.data.id] }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.getDataList();
+                  },
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          })
+          .catch(() => { });
+      } else if (val.type === 'edit') {
+        this.addOrUpdateVisible = true
+        this.addOrEditTitle = this.$t('edit')
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      }
+    },
+    // addOrUpdateHandle(productData) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(productData);
+    //   });
+    // },
+    buttonClick(val) {
+      console.log(val);
+      switch (val.btnName) {
+        case "search":
+          // this.listQuery.paramCode = val.paramCode;
+          // console.log(i18n);
+          this.listQuery.name = val.name ? val.name : null
+          this.listQuery.code = val.code ? val.code : null
+          this.listQuery.page = 1
+          this.getDataList()
+          break;
+        case "export":
+         this.exportHandle()
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+      }
+    },
+  },
+};
+</script>
--- a/src/views/modules/supplier/qmsSupplierType.vue
+++ b/src/views/modules/supplier/qmsSupplierType.vue
@ -2,9 +2,9 @@
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-sys__user">
      <SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
-        <el-badge :value="2" 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 id="palletTable" :table-props="tableProps" :page="listQuery.page" ref="palletTable1"
         :limit="listQuery.limit" :table-data="tableData">
@ -104,20 +104,24 @@ export default {
      addOrUpdateVisible: false,
      productOrUpdateVisible: false,
      formConfig: [
-        // {
-        //   type: "",
-        //   label: i18n.t("params.paramCode"),
-        //   placeholder: i18n.t("params.paramCode"),
-        //   param: "paramCode",
-        // },
-        // {
-        //   type: "separate",
-        // },
+        {
+          type: 'input',
+          label: i18n.t('supplier.name'),
+          placeholder: i18n.t('supplier.name'),
+          param: 'name'
+        },
+        {
+          type: 'input',
+          label: i18n.t('supplier.code'),
+          placeholder: i18n.t('supplier.code'),
+          param: 'code'
+        },
        {
          type: "button",
          btnName: i18n.t('add'),
          name: "add",
-          color: "primary",
+          color: "success",
+          plain:true
        },
        {
          type: "button",
@ -131,7 +135,7 @@ export default {
          btnName: i18n.t('export'),
          name: "export",
          color: "primary",
-          // plain: true,
+          plain: true
        }
      ],
    };
@ -283,7 +287,8 @@ export default {
      switch (val.btnName) {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
-          this.listQuery.key = null;
+          this.listQuery.name = val.name ? val.name :null
+          this.listQuery.code = val.code ? val.code : null
          // console.log(i18n);
          this.listQuery.page = 1;
          this.getDataList();
Author	SHA1	Message	Date
zhp	37bd4fd532	Merge pull request 'zhp' (#17 ) from zhp into master Reviewed-on: #17	2023-07-13 08:40:12 +08:00
‘937886381’	8a7f6d3dad	Merge branch 'master' into zhp	2023-07-13 08:36:09 +08:00
‘937886381’	d6e9fc79f2	修改bug	2023-07-13 08:35:26 +08:00