Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms

# Conflicts:
#	src/views/inspectionWork/edit.vue

src/api/inspectionWork/index.js

@@ -91,3 +91,10 @@ export async function queryQualityTempleContent(data) {
     return res.data.data;
   }
 }
+// 仓库定义列表
+export async function warehouseList(data) {
+  const res = await request.post('/wms/warehouse/select/warehouseList', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+}

src/views/inspectionPlan/components/edit.vue

@@ -515,6 +515,7 @@ export default {
           this.$message.warning('取样数量不能大于包装数量！');
           return;
         }
+        
       }
       this.sampleLis = [];
       let num = Number(val);

src/views/inspectionWork/components/sampleDisposeDialog.vue

@@ -20,28 +20,22 @@
               </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 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="disposeWarehouseId" align="center">
+              <el-select v-model="tableData.disposeWarehouseId" placeholder="请选择" style="width: 100%;" clearable @change="handleWarehouseChange">
+                <el-option v-for="item in warehouseList" :key="item.disposeWarehouseId"
+                           :label="item.disposeWarehouseName" :value="item.disposeWarehouseId">
+                </el-option>
+              </el-select>
             </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-col>
+          <el-col :span="6">
+            <el-form-item label="留样日期" prop="sampleDate" align="center" >
+              <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">
@@ -50,6 +44,35 @@
                               value-format="yyyy-MM-dd" placeholder="请输入"></el-date-picker>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="留样条件" prop="sampleCondition" align="center"  >
+              <el-input v-model="tableData.sampleCondition" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="生产商/受托生产" prop="producerManufacturer" align="center"  >
+              <el-input v-model="tableData.producerManufacturer" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="留样地点" prop="samplePlace" align="center"  >
+              <el-input type="textarea" v-model="tableData.samplePlace" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="留样备注" prop="sampleRemark" align="center" >
+              <el-input type="textarea" v-model="tableData.sampleRemark" placeholder="请输入" style="width: 100%;"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
         <template v-slot:footer >
@@ -63,6 +86,8 @@
 
 <script>
 
+import { warehouseList } from '@/api/inspectionWork';
+
 export default {
     components: {
 
@@ -76,6 +101,17 @@ export default {
             type: '',
           tableData: {},
           qualityType: '',
+          warehouseList:[],
+          // 表单验证规则
+          rules: {
+            disposeTime: [
+              {
+                required: true,
+                message: '请输入绑定手机号',
+                trigger: 'blur'
+              }
+            ],
+          },
           disposalStatusList: [
             {
               value: 1,
@@ -133,15 +169,33 @@ export default {
     computed: {
     },
 
-    created() { },
+    created() {
+      this.getWarehouseList();
+    },
     methods: {
+      handleWarehouseChange(val){
+        this.warehouseList.findIndex((item) => {
+          if(item.disposeWarehouseId == val){
+            this.tableData.disposeWarehouseName = item.disposeWarehouseName;
+          }
+        })
+      },
+      async getWarehouseList() {
+        let res = await warehouseList({});
+        this.warehouseList = res.map((item) => {
+          item.disposeWarehouseName = item.name;
+          item.disposeWarehouseId = item.id;
+          return {
+            ...item
+          }
+        })
+      },
         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.rowIndex = index
+          this.type = type;
+          this.tableData = row;
 
 
             this.visible = true;
@@ -151,6 +205,7 @@ export default {
         },
         handleConfirm() {
             this.visible = false;
+            console.log(this.tableData,"sdfd");
             this.$emit('handleDisposeConfirm', this.tableData, this.rowIndex);
         },
     }

src/views/inspectionWork/edit.vue

@@ -468,7 +468,16 @@ export default {
       // 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);
+      this.sampleList[index].sampleDate = this.formatCurrentDate();
+      this.sampleList[index].disposeTime = this.formatCurrentDate();
+      this.$refs.disposeRef.openDispose(index, row, type, null, null, this.form.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}`;
     },
     // 报工
     handleReporting(index, row) {