修改bug

2023-07-11 17:01:39 +08:00
parent cb49f5e6b8
commit 7728882b29
30 changed files with 606 additions and 281 deletions
--- a/src/views/modules/quality/components/customSampling-add.vue
+++ b/src/views/modules/quality/components/customSampling-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-04-04 13:57:52
+ * @LastEditTime: 2023-07-11 15:53:48
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -65,7 +65,7 @@
        :placeholder="$i18nForm([$t('quality.minor'), $t('quality.unacceptable')])">
      </el-input>
    </el-form-item>
-    <el-form-item prop="totalAcceptable" :label="$i18nForm([$t('quality.total'), $t('quality.acceptable')])">
+    <!-- <el-form-item prop="totalAcceptable" :label="$i18nForm([$t('quality.total'), $t('quality.acceptable')])">
      <el-input v-model="dataForm.totalAcceptable"
        :placeholder="$i18nForm([$t('quality.total'), $t('quality.acceptable')])">
      </el-input>
@@ -74,7 +74,7 @@
      <el-input v-model="dataForm.totalUnacceptable"
        :placeholder="$i18nForm([$t('quality.total'), $t('quality.unacceptable')])">
      </el-input>
-    </el-form-item>
+    </el-form-item> -->
    <!-- <el-form-item prop="criticalSampleSize" :label="[$t('quality.fatalFlaw') + $t('quality.sampleSize')]">
      <el-input v-model="dataForm.criticalSampleSize"
        :placeholder="[$t('quality.fatalFlaw') + $t('quality.sampleSize')]">
--- a/src/views/modules/quality/components/transferRecords-add.vue
+++ b/src/views/modules/quality/components/transferRecords-add.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-02-14 15:02:26
- * @LastEditTime: 2023-07-10 11:08:31
+ * @LastEditTime: 2023-07-11 15:33:25
 * @LastEditors: zhp
 * @Description: 
 -->
@@ -46,6 +46,12 @@
    <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="userId" :label="$t('quality.userName')">
+      <el-select v-model="dataForm.userId" :placeholder="$t('quality.userName')">
+        <el-option v-for="item in userList" :key="item.id" :label="item.username" :value="item.id">
+        </el-option>
+      </el-select>
+    </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>
@@ -64,6 +70,7 @@ export default {
        getSupplierList: "/supplier/qmsSupplier/page",
        getProductList: "/basic/qmsProduct/page",
        infoURL: "/quality/qmsTransferRecords/{id}",
+        getUserListURL: '/sys/user/page',
        getTransferSchemeListURL: '/quality/qmsTransferScheme/page'
      },
      supplierList: [],
@@ -162,6 +169,7 @@ export default {
        limit: 999,
        page:1,
      },
+      userList:[],
      dataForm: {
        id: null,
        inspectionStage:null,
@@ -173,7 +181,8 @@ export default {
        transferInId: null,
        transferInName: null,
        transferOutId: null,
-        remark:null
+        remark: null,
+        userId:null
      },
    };
  },
@@ -234,6 +243,19 @@ export default {
        })
        .catch(() => {
        })
+      this.$http
+        .get(this.urlOptions.getUserListURL, {
+          params: {
+            limit: 999,
+            page: 1,
+          }
+        })
+        .then(({ data: res }) => {
+          // this.dataListLoading = false;
+          if (res.code === 0) {
+            this.userList = res.data.list
+          }
+        })
      this.$http.get(this.urlOptions.getProductList, {
        params: this.listQuery
      })
--- a/src/views/modules/quality/qmsDisposalMethod.vue
+++ b/src/views/modules/quality/qmsDisposalMethod.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-01-11 09:24:58
- * @LastEditTime: 2023-07-06 15:39:55
+ * @LastEditTime: 2023-07-11 15:38:25
 * @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"
@@ -26,7 +26,7 @@
        </disposalMethod-add>
        <!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
      </base-dialog>
-      <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
+      <!-- <base-dialog :dialogTitle="searchOrEditTitle" :dialogVisible="searchOrUpdateVisible" @cancel="handleSearchCancel"
        @confirm="handleSearchConfirm" :before-close="handleSearchCancel">
        <disposalMethod-search ref="searchOrUpdate" @successSubmit="conditionSearchSubmit"></disposalMethod-search>
        <el-row slot="footer" type="flex" justify="end">
@@ -41,7 +41,7 @@
            </el-button>
          </el-col>
        </el-row>
-      </base-dialog>
+      </base-dialog> -->
    </div>
  </el-card>
 </template>
@@ -86,11 +86,15 @@ const tableBtn = [
    type: "delete",
    btnName: "删除",
  },
+  {
+    type: "change",
+    btnName: "改变状态",
+  },
 ];
 export default {
-  mixins: [basicPage, basicSearch],
+  mixins: [basicPage],
  components: {
-    disposalMethodSearch,
+    // disposalMethodSearch,
    disposalMethodAdd
  },
  data() {
@@ -98,32 +102,45 @@ export default {
      urlOptions: {
        getDataListURL: "/quality/qmsDisposalMethod/page",
        deleteURL: "/quality/qmsDisposalMethod",
+        submitURL: '/quality/qmsDisposalMethod'
      },
      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('basic.status'),
+          placeholder: i18n.t('basic.status'),
+          param: 'status',
+          selectOptions: [
+            {
+              id: '0',
+              name: '不可用'
+            },
+            {
+              id: '1',
+              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,
        }
      ],
    };
@@ -172,7 +189,7 @@ export default {
                  type: "success",
                  duration: 1500,
                  onClose: () => {
-                    this.getDataList();
+                    this.getDataList()
                  },
                });
              } else {
@@ -186,7 +203,27 @@ export default {
        this.addOrEditTitle = this.$t('edit')
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(val.data.id);
-        });
+        })
+      } else if (val.type === 'change') {
+        let obj = {
+          disposalMethodStatus: val.data.disposalMethodStatus === 0 ? 1 : 0,
+          id: val.data.id
+        }
+        this.$http.put(this.urlOptions.submitURL, obj)
+          .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.getDataList()
+              },
+            });
+          })
      }
    },
    buttonClick(val) {
@@ -194,7 +231,7 @@ export default {
        case "search":
          // this.listQuery.paramCode = val.paramCode;
          this.listQuery.page = 1;
-          this.listQuery.key = null
+          this.listQuery.status =val.status ? val.status : null
          this.getDataList();
          break;
        case "add":