提交处理页面但未完成

src/views/inspectionWork/components/sampleDisposeDialog.vue

@@ -0,0 +1,158 @@
+<!-- 用户编辑弹窗 -->
+<template>
+    <ele-modal :title="title" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
+        :close-on-press-escape="false" append-to-body width="80%" :maxable="true">
+      <el-form ref="form1" :model="tableData" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="处置方式" prop="disposalStatus" align="center" v-if="qualityType == 1">
+              <el-select v-model="tableData.disposalStatus" placeholder="请选择" style="width: 100%;" >
+                <el-option v-for="item in disposalStatusListType" :key="item.value"
+                           :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="处置方式" prop="disposalStatus" align="center"  v-else>
+              <el-select v-model="tableData.disposalStatus" placeholder="请选择" style="width: 100%;" >
+                <el-option v-for="item in disposalStatusList" :key="item.value"
+                           :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="留样地点" prop="samplePlace" align="center"  >
+              <el-input v-model="tableData.samplePlace" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="生产商/受托生产企业" prop="producerManufacturer" align="center"  v-if="qualityType == 1">
+              <el-input v-model="tableData.producerManufacturer" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="留样条件" prop="sampleCondition" align="center"  v-if="qualityType == 1">
+              <el-input v-model="tableData.sampleCondition" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="留样备注" prop="sampleRemark" align="center"  v-if="qualityType == 1">
+              <el-input v-model="tableData.sampleRemark" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="处置仓库Id" prop="disposeWarehouseId" align="center"  v-if="qualityType == 1">
+              <el-input v-model="tableData.disposeWarehouseId" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="处置仓库" prop="disposeWarehouseName" align="center"  v-if="qualityType == 1">
+              <el-input v-model="tableData.disposeWarehouseName" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+            <el-form-item label="留样日期" prop="sampleDate" align="center"  v-if="qualityType == 1">
+              <el-date-picker class="w100" v-model="tableData.sampleDate" type="date"
+                              value-format="yyyy-MM-dd" placeholder="请输入"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处置时间:" prop="disposeTime">
+              <el-date-picker class="w100" v-model="tableData.disposeTime" type="date"
+                              value-format="yyyy-MM-dd" placeholder="请输入"></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+        <template v-slot:footer >
+            <el-button @click="handleClose">取消</el-button>
+            <el-button type="primary" @click="handleConfirm">
+                确认
+            </el-button>
+        </template>
+    </ele-modal>
+</template>
+
+<script>
+
+export default {
+    components: {
+
+    },
+    data() {
+
+        return {
+            title: '',
+            visible: false,
+            rowIndex: 0,
+            type: '',
+          tableData: {},
+          qualityType: '',
+          disposalStatusList: [
+            {
+              value: 1,
+              label: '返工'
+            },
+            {
+              value: 2,
+              label: '返修'
+            },
+            {
+              value: 3,
+              label: '报废'
+            },
+            {
+              value: 4,
+              label: '降级使用'
+            },
+            {
+              value: 5,
+              label: '让步接收'
+            },
+            {
+              value: 6,
+              label: '留样'
+            },
+            {
+              value: 7,
+              label: '消耗'
+            },
+            {
+              value: 8,
+              label: '回用'
+            },
+          ],
+          disposalStatusListType: [
+            {
+              value: 3,
+              label: '报废'
+            },
+            {
+              value: 6,
+              label: '留样'
+            },
+            {
+              value: 7,
+              label: '消耗'
+            },
+            {
+              value: 8,
+              label: '回用'
+            },
+          ]
+        };
+    },
+    computed: {
+    },
+
+    created() { },
+    methods: {
+        async openDispose(index, row, type, list,isStatus,qualityType) {
+          this.tableData = [];
+          this.qualityType = qualityType;
+            this.rowIndex = index
+            this.type = type;
+            row.sampleDate = new Date(row.sampleDate);
+            this.tableData = row;
+
+
+            this.visible = true;
+        },
+        handleClose() {
+            this.visible = false;
+        },
+        handleConfirm() {
+            this.visible = false;
+            this.$emit('handleDisposeConfirm', this.tableData, this.rowIndex);
+        },
+    }
+};
+</script>

src/views/inspectionWork/edit.vue

@@ -59,11 +59,11 @@
           <el-table-column label="重量单位" prop="weightUnit" align="center" width="80" fixed="right" :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="处置状态" prop="disposalStatus" align="center" width="80" fixed="right" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span v-if="scope.row.disposalStatus == 1 ">返工</span>
-              <span v-if="scope.row.disposalStatus == 2 ">返修</span>
+              <span v-if="scope.row.disposalStatus == 1 && form.qualityType == 2">返工</span>
+              <span v-if="scope.row.disposalStatus == 2 && form.qualityType == 2 ">返修</span>
               <span v-if="scope.row.disposalStatus == 3 ">报废</span>
-              <span v-if="scope.row.disposalStatus == 4 ">降级使用</span>
-              <span v-if="scope.row.disposalStatus == 5 ">让步接收</span>
+              <span v-if="scope.row.disposalStatus == 4 && form.qualityType == 2">降级使用</span>
+              <span v-if="scope.row.disposalStatus == 5 && form.qualityType == 2">让步接收</span>
               <span v-if="scope.row.disposalStatus == 6 ">留样</span>
               <span v-if="scope.row.disposalStatus == 7 ">消耗</span>
               <span v-if="scope.row.disposalStatus == 8 ">回用</span>
@@ -93,7 +93,7 @@
                 @click="handleDetail(scope.$index, scope.row, 'report')">
                 质检
               </el-link>
-              <el-link type='primary' :underline="false"> 处置 </el-link>
+              <el-link type='primary' :underline="false" @click="handleDispose(scope.$index, scope.row, 'dispose')"> 处置 </el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -125,6 +125,7 @@
     </el-card>
 
     <sampleListDialog ref="detailRef" @handleConfirm="handleConfirm"></sampleListDialog>
+    <sampleDisposeDialog ref="disposeRef" @handleDisposeConfirm="handleDisposeConfirm"></sampleDisposeDialog>
   </div>
 </template>
 
@@ -138,13 +139,15 @@ import dictMixins from '@/mixins/dictMixins';
 
 // import term from './term';
 import sampleListDialog from './components/sampleListDialog.vue';
+import sampleDisposeDialog from './components/sampleDisposeDialog.vue';
 
 import { finishPageTab } from '@/utils/page-tab-util';
 export default {
   components: {
     baseInfo,
     // term
-    sampleListDialog
+    sampleListDialog,
+    sampleDisposeDialog
   },
   mixins: [dictMixins],
 
@@ -439,7 +442,6 @@ export default {
       this.$router.go(-1);
     },
     handleDetail(index, row, type) {
-      debugger
       if (!this.sampleList[index] || !this.schemeList) {
         return;
       }
@@ -448,6 +450,15 @@ export default {
       console.log(index, row, type, selectedData, 'index, row, type, mergedData')
       this.$refs.detailRef.openDia(index, row, type, selectedData,null);
     },
+    handleDispose(index, row, type) {
+      if (!this.sampleList[index] ) {
+        return;
+      }
+      // const selectedData = [];
+      // selectedData.push(this.sampleList[index])
+      // console.log(index, row, type, selectedData, 'index, row, type, mergedData')
+      this.$refs.disposeRef.openDispose(index, row, type, null,this.form.qualityType);
+    },
     // 报工
     handleReporting(index, row) {
       this.$refs.baseInfoRefs.$refs.form1.validate((valid) => {
@@ -474,6 +485,14 @@ export default {
           });
       })
     },
+    // 处理确认事件
+    handleDisposeConfirm(list, index) {
+      if (index != null){
+        this.$set(this.sampleList, index, list[0]);
+      }else{
+        this.$set(this.sampleList, null, list);
+      }
+    },
     //确认报工
     handleConfirm(list, index) {
       console.log(list)