提交修改处置页面

src/views/inspectionPlan/components/baseInfo.vue

@@ -137,12 +137,17 @@
         </el-form-item>
       </el-col>
       <el-col :span="6">
-        <el-form-item label="合格品数量:" prop=" qualifiedNumber">
-          <el-input type="number" v-model="form.qualifiedNumber" disabled />
+        <el-form-item label="工序:" prop=" produceTaskName">
+          <el-input  v-model="form.produceTaskName" disabled />
         </el-form-item>
       </el-col>
     </el-row>
     <el-row>
+      <el-col :span="6">
+        <el-form-item label="合格品数量:" prop=" qualifiedNumber">
+          <el-input type="number" v-model="form.qualifiedNumber" disabled />
+        </el-form-item>
+      </el-col>
       <el-col :span="6">
         <el-form-item label="不合格品数量:" prop=" unqualifiedNumber">
           <el-input type="number" v-model="form.unqualifiedNumber" disabled />
@@ -413,6 +418,9 @@ export default {
       this.form.totalWeight = val.totalWeight;
       this.form.sampleNumber = val.sampleNumber;
       this.form.inspectionStandards = val.inspectionStandards;
+      this.form.produceTaskName = val.produceTaskName;
+      this.form.produceTaskId = val.produceTaskId;
+      this.form.productId = val.productId;
       let receiveNo = val.receiveNo;
       let categoryCode = val.productCode;
       let categoryid = val.productId;

src/views/inspectionPlan/components/edit.vue

@@ -412,6 +412,10 @@ export default {
         productCode: productCode,
         qualityQlanId: ids
       }).then((res) => {
+        if (Object.keys(res).length === 0) {
+          this.$message.error('请确认该物品是否配置质检方案！');
+          return;
+        }
         console.log(res, 'resresresresresresresresresresresresresresresresresresresresresres')
         this.baseForm.inspectionStandards = res?.inspectionStandards;
 
@@ -601,7 +605,7 @@ export default {
           return false;
         }
         this.loading = true;
-
+        this.baseForm.isUnpack = this.isCheck ? 1 : 2;
         let params = {
           ...this.baseForm,
           qualityInventoryList: this.packingList,

src/views/inspectionPlan/components/searchWarehousing.vue

@@ -0,0 +1,107 @@
+<!-- 搜索表单 -->
+<template>
+  <el-form
+    label-width="100px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
+    <el-row :gutter="15">
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="收货单编码:">
+          <el-input clearable v-model="where.receiveNo" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品编号:">
+          <el-input clearable v-model="where.productCode" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品名称:">
+          <el-input clearable v-model="where.productName" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="批次号:">
+          <el-input clearable v-model="where.batchNo" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row :gutter="15">
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="质检结果:">
+          <el-select
+            v-model="where.qualityResults"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option label="合格" :value="1" />
+            <el-option label="不合格" :value="2" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="质检状态:">
+          <el-select
+            v-model="where.qualityStatus"
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option label="未检" :value="0" />
+            <el-option label="已检" :value="1" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
+        <div style="text-align: right">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
+            查询
+          </el-button>
+          <el-button @click="reset">重置</el-button>
+        </div>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+  export default {
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        qualityStatus: 0,
+      };
+      return {
+        defaultWhere: { ...defaultWhere },
+        // 表单数据
+        where: { ...defaultWhere }
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search() {
+        console.log(this.where);
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
+      }
+    }
+  };
+</script>

src/views/inspectionPlan/components/warehousing.vue

@@ -11,6 +11,7 @@
     <div>
       <el-row>
         <el-col :span="24" class="table_col" v-if="equipmentdialog">
+          <searchWarehousing ref="search" @search="reload"></searchWarehousing>
           <ele-pro-table
             ref="equiTable"
             :columns="columns"
@@ -38,9 +39,12 @@
     purchaseorderreceive,
     purchaseorderreceiveGetById
   } from '@/api/inspectionPlan/index.js';
+  import searchWarehousing from './searchWarehousing.vue';
 
   export default {
-    components: {},
+    components: {
+      searchWarehousing
+    },
     props: {
       selectList: Array,
       type: {
@@ -210,6 +214,9 @@
         // });
         this.$emit('choose', this.current);
         this.handleClose();
+      },
+      reload(where) {
+        this.$refs.equiTable.reload({ page: 1, where });
       }
     }
   };

src/views/samplemanagement/components/edit.vue

@@ -7,7 +7,7 @@
         <el-button type="primary" @click="submit" :loading="loading" >提交</el-button>
       </header-title>
     <base-info ref="baseInfoRefs" v-if="baseForm" :form="baseForm" :btnType="btnType" ></base-info>
-    <ele-pro-table ref="table" :columns="tableColumns" :datasource="datasource">
+    <ele-pro-table ref="table" :columns="tableColumns" :datasource="datasource" :pageSize="20"  :pageSizes="[20, 30, 40, 50, 100]">
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>
       </template>
@@ -16,18 +16,9 @@
           {{ row.categoryCode }}
         </el-link>
       </template>
-      <template v-slot:disposalStatus="{ row }">
-        {{ row.disposalStatus == 1 ? '返工' : row.disposalStatus == 2 ? '返修' : row.disposalStatus == 3? '报废' : row.disposalStatus == 4? '降级使用' : row.disposalStatus == 5? '让步接收' : row.disposalStatus == 6? '留样' : row.disposalStatus == 7? '消耗' : row.disposalStatus == 8? '回用' : '' }}
-      </template>
-      <template v-slot:qualityStatus="{ row }">
-        {{ row.qualityStatus == 0? '未检' : row.qualityStatus == 1? '已检' : row.qualityStatus == 2? '待检' : ''}}
-      </template>
-      <template v-slot:qualityResults="{ row }">
-        {{ row.qualityResults === '1'? '合格' : row.qualityResults === '2'? '不合格' : ''}}
-      </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
-        <el-link type="primary" :underline="false" @click="handleDispose(scope.$index, row, 'dispose')">
+        <el-link type="primary" :underline="false" @click="handleDispose(row, 'dispose')">
           处置
         </el-link>
       </template>
@@ -89,10 +80,17 @@ export default {
         { label: '采购日期', prop: 'purchaseDate', align: 'center' ,showOverflowTooltip: true},
         { label: '重量', prop: 'weight', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
         { label: '重量单位', prop: 'weightUnit', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
-        { label: '处置状态', prop: 'disposalStatus', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
+        { label: '处置状态', prop: 'disposalStatus', align: 'center' ,showOverflowTooltip: true,fixed: 'right',formatter: (row, column, cellValue) => {
+            return cellValue == 1 ? '返工' : cellValue == 2 ? '返修' : cellValue == 3? '报废' : cellValue == 4? '降级使用' :
+              cellValue == 5? '让步接收' : cellValue == 6? '留样' : cellValue == 7? '消耗' : cellValue == 8? '回用' : '';
+          }},
         { label: '处置时间', prop: 'disposeTime', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
-        { label: '质检状态', prop: 'qualityStatus', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
-        { label: '质检结果', prop: 'qualityResults', align: 'center' ,showOverflowTooltip: true,fixed: 'right'},
+        { label: '质检状态', prop: 'qualityStatus', align: 'center' ,showOverflowTooltip: true,fixed: 'right',formatter: (row, column, cellValue) => {
+            return cellValue == 0? '未检' : cellValue == 1? '已检' : cellValue == 2? '待检' : '';
+          }},
+        { label: '质检结果', prop: 'qualityResults', align: 'center' ,showOverflowTooltip: true,fixed: 'right',formatter: (row, column, cellValue) => {
+            return cellValue == 1 ? '合格' : cellValue == 2 ? '不合格' : '';
+          }},
         {columnKey: 'action',label: '操作',align: 'center',width: 120,resizable: false,slot: 'action',fixed: 'right'}
       ],
     };
@@ -108,9 +106,9 @@ export default {
     }
   },
   methods: {
-    datasource({ page, where, limit }) {
+    datasource({page, where, limit}) {
       where.qualityWorkOrderId = this.$route.query.qualityWorkOrderId;
-      return getSampleQWorkOrderIdPage({
+     return getSampleQWorkOrderIdPage({
         ...where,
         pageNum: page,
         size: limit
@@ -149,25 +147,42 @@ export default {
     submit() {
       this.loading = false;
     },
-    handleDispose(index, row, type) {
-      row.sampleDate = this.formatCurrentDate();
-      row.disposeTime = this.formatCurrentDate();
-      this.$refs.disposeRef.openDispose(index, row, type, null, null, this.baseForm.qualityType);
-    },
-    formatCurrentDate() {
-      const date = new Date();
-      const year = date.getFullYear();
-      const month = String(date.getMonth() + 1).padStart(2, '0');
-      const day = String(date.getDate()).padStart(2, '0');
-      return `${year}-${month}-${day}`;
+    handleDispose( row, type) {
+
+      row.sampleDate = this.getNowTimes();
+
+      row.disposeTime = this.getNowTimes();
+
+      console.log(null, row, type, this.$route.query.qualityType)
+
+      this.$refs.disposeRef.openDispose(null, row, type, this.$route.query.qualityType);
     },
     // 处理确认事件
-    handleDisposeConfirm(list, index) {
-      if (index != null) {
-        this.$set(this.sampleList, index, list[0]);
-      } else {
-        this.$set(this.sampleList, null, list);
-      }
+    handleDisposeConfirm(row, index) {
+      console.log(row, index, '处置确认');
+    },
+    getNowDate() {
+      let date = new Date(),
+        obj = {
+          year: date.getFullYear(), //获取当前月份(0-11,0代表1月)
+          month: date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
+          strDate: date.getDate(), // 获取当前日(1-31)
+          hour: date.getHours(), //获取当前小时(0 ~ 23)
+          minute: date.getMinutes(), //获取当前分钟(0 ~ 59)
+          second: date.getSeconds() //获取当前秒数(0 ~ 59)
+        };
+      Object.keys(obj).forEach((key) => {
+        if (obj[key] < 10) obj[key] = `0${obj[key]}`;
+      });
+      return obj;
+    },
+    getNowTime() {
+      const nowDate = this.getNowDate()
+      return nowDate.year + '-' + nowDate.month + '-' + nowDate.strDate + ' ' + nowDate.hour + ':' + nowDate.minute + ':' + nowDate.second
+    },
+    getNowTimes() {
+      const nowDate = this.getNowDate()
+      return nowDate.year + '-' + nowDate.month + '-' + nowDate.strDate
     },
   }
 };

src/views/samplemanagement/index.vue

@@ -2,7 +2,7 @@
     <div class="ele-body">
         <el-card shadow="never">
             <search ref="search" @search="reload"></search>
-            <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
+            <ele-pro-table ref="table" :columns="columns" :datasource="datasource" :pageSize="20"  :pageSizes="[20, 30, 40, 50, 100]">
                 <!-- 表头工具栏 -->
                 <template v-slot:toolbar>
 
@@ -86,7 +86,8 @@ export default {
             query: {
               type: type,
               qualityWorkOrderId: row.qualityWorkOrderId || '',
-              id: row.id || ''
+              id: row.id || '',
+              qualityType: row.qualityType || ''
             }
           });
             // this.$refs.edit.open(type, row)