问题修改

src/api/productionManagement/sinTerWorkOrder.js

@@ -20,3 +20,31 @@ export const interlocking = (data) => {
     params:data,
   });
 };
+
+
+// 获取是否能做转试记录
+export const isTransferTest = (data) => {
+  return request({
+    url: '/blade-desk/QA/PlanTest/isTransferTest',
+    method: 'post',
+    params: data,
+  });
+};
+
+// 获取转试记录列表 
+export const trialItemList = (data) => {
+  return request({
+    url: '/blade-desk/QA/PlanTest/trialItemList',
+    method: 'post',
+    params: data,
+  });
+};
+
+// 转试记录提交
+export const launchTest = (data) => {
+  return request({
+    url: '/blade-desk/QA/PlanTest/launchTest',
+    method: 'post',
+    data: data,
+  });
+};

src/api/qualityManagement/productionTesting/prPlanTestRec.js

@@ -3,7 +3,7 @@ import request from '@/axios';
 // 获取列表
 export const getList = (params) =>{
     return request({
-        url:'/api/blade-desk/QA/PlanTest/list',
+        url:'/api/blade-desk/QA/PlanTest/page',
         method:'get',
         params
     })
@@ -12,8 +12,8 @@ export const getList = (params) =>{
 // 详情
 export const getDetail = (params) =>{
     return request({
-        url:'/api/blade-desk/QA/PlanTest/detail',
+        url:'/api/blade-desk/QA/PlanTest/detailPageInfo',
-        method:'get',
+        method:'post',
-        params
+        data:params
     })
 }

src/components/jh-select/index.vue

@@ -210,7 +210,7 @@ export default {
     // 新增：通过接口获取完整数据
     async getEchoData(val) {
       try {
-        const params = { [this.echoParamsKey]: val };
+        const params = { [this.echoParamsKey]: val==null?'':val };
         let res;
         if (this.echoMethod.toLowerCase() === 'post') {
           res = await axios.post(this.echoApi, params);

src/views/flowManagement/addDialog.vue

@@ -8,7 +8,13 @@
     fullscreen
   >
     <!-- 单个 Form 包裹所有内容（基础信息 + 表格） -->
-    <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px" label-position="right">
+    <el-form
+      ref="addForm"
+      :model="addForm"
+      :rules="addRules"
+      label-width="100px"
+      label-position="right"
+    >
       <!-- 项目基础信息表单 -->
       <el-row>
         <el-col :span="8">
@@ -607,7 +613,12 @@ export default {
     getDeplList() {
       getDeplList().then(res => {
         // console.log(res.data.data, 'res');
-        this.deplList = res.data.data;
+        if (res.data.data.children.length > 0) {
+          this.deplList = res.data.data.children;
+        } else {
+          this.deplList = [];
+        }
+        // this.deplList = res.data.data;
       });
     },
     // 获取人员
@@ -719,7 +730,7 @@ export default {
       }
       submitData.stoneList = submitData.stoneList.map(row => {
         const { fmProjectApplication, attachList, paIndex, ...validData } = row;
-        validData.milestoneNode=validData.milestoneNode+' 00:00:00'
+        validData.milestoneNode = validData.milestoneNode + ' 00:00:00';
         return validData;
       });
       return submitData;

src/views/productionManagement/sinTerWorkOrder/index.vue

@@ -47,6 +47,9 @@
               <el-dropdown-item v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
                 <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
               </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus < 15">
+                <el-button type="text" @click="transferTest(scope.row)">转试</el-button>
+              </el-dropdown-item>
               <el-dropdown-item v-if="scope.row.runStatus < 15">
                 <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
               </el-dropdown-item>
@@ -138,6 +141,9 @@
       @closeDialog="closeDialog"
       :rowItem="rowItem"
     ></workRate>
+
+    <!-- 转试 -->
+     <transferTest v-if="transferTestOpen" :showDialog="transferTestOpen" @cancel="closeDialog" :rowItem="rowItem"></transferTest>
   </basic-container>
 </template>
 
@@ -148,8 +154,9 @@ import closedDialog from '../components/closedDialog.vue';
 import abnormalDialog from '../components/abnormalDialog.vue';
 import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
 
-import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder';
+import { getList, interlocking, isTransferTest } from '@/api/productionManagement/sinTerWorkOrder';
 import workRate from '@/views/workRate/index.vue';
+import transferTest from './transferTest.vue';
 
 export default {
   components: {
@@ -159,6 +166,7 @@ export default {
     abnormalDialog,
     productionMonitoringDialog,
     workRate,
+    transferTest
   },
   data() {
     return {
@@ -522,10 +530,22 @@ export default {
           },
         ],
       },
+      rowItem:{},
+      transferTestOpen:false,
     };
   },
   mounted() {},
   methods: {
+    transferTest(row) {
+      isTransferTest({ woId: row.woId }).then(res => {
+        if (!res.data.data) {
+          this.transferTestOpen = true;
+          this.rowItem = row;
+        } else {
+          this.$message.warning('该订单不符合转试要求，不能转试！');
+        }
+      });
+    },
     printCraftCard_new(row) {
       window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId);
     },
@@ -639,6 +659,7 @@ export default {
       this.showAbnormal = false;
       this.isPriorityOpen = false;
       this.isWorkRateOpen = false;
+      this.transferTestOpen = false;
       // if (type) {
       this.onLoad(this.page, this.query);
       // }

src/views/productionManagement/sinTerWorkOrder/transferTest.vue

@@ -0,0 +1,129 @@
+<template>
+  <el-dialog
+    v-drag
+    title="转试"
+    :modelValue="openShow"
+    :before-close="cancel"
+    :def-width="500"
+    append-to-body
+  >
+    <el-form ref="form" :model="formData" :rules="rules" label-width="100px" class="el-form-row">
+      <el-form-item label="试验计划" prop="testValue">
+        <el-select v-model="formData.testValue" placeholder="请选择">
+          <el-option
+            v-for="item in optionsList"
+            :key="item.value"
+            :label="item.label"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="memo">
+        <el-input
+          v-model="formData.memo"
+          :autosize="{ minRows: 3, maxRows: 6 }"
+          show-word-limit
+          maxlength="900"
+          type="textarea"
+          placeholder="请输入内容"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submit" :disabled="isDisabled">确定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import {
+  trialItemList,
+  launchTest,
+  isTransferTest,
+} from '@/api/productionManagement/sinTerWorkOrder';
+
+export default {
+  props: {
+    showDialog: { type: Boolean, default: false },
+    rowItem: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+      formData: { testValue: null },
+      // rules: {
+      //   testValue: [this.$validation.required]
+      // },
+      optionsList: [],
+      isDisabled: false,
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.open();
+  },
+  methods: {
+    open() {
+      // 查询转试得试验项目数据
+      trialItemList().then(res => {
+        this.optionsList = res.data.data;
+      });
+      // this.$ajax.post('prWorkOrder/trialItemList').then(res => {
+      //   if (this.$ifAjax(res)) {
+      //     this.optionsList = res.data;
+      //   }
+      // });
+    },
+    submit() {
+      this.isDisabled = true;
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          launchTest({
+            testList: [this.formData.testValue],
+            remark: this.formData.memo,
+            batchNo: this.rowItem.batchNo,
+            quantity: this.rowItem.makeQty,
+            partCode: this.rowItem.partCode,
+            partName: this.rowItem.partName,
+            productType: this.rowItem.productType,
+            woId: this.rowItem.woId,
+            woCode: this.rowItem.woCode,
+          }).then(res => {
+            this.$message.success('转试成功');
+            this.cancel(false);
+            this.isDisabled = false;
+          });
+          this.$ajax.post('prWorkOrder/launchTest', {
+            testList: [this.formData.testValue],
+            remark: this.formData.memo,
+            batchNo: this.rowItem.batchNo,
+            quantity: this.rowItem.makeQty,
+            partCode: this.rowItem.pjYieldOrder.partCode,
+            partName: this.rowItem.pjYieldOrder.partName,
+            productType: this.rowItem.pjYieldOrder.productType,
+            woId: this.rowItem.woId,
+            woCode: this.rowItem.woCode,
+          });
+          //   .then(res => {
+          //     if (this.$ifAjax(res)) {
+          // this.$message.success('转试成功');
+          // this.cancel(false);
+          // this.isDisabled = false;
+          //     }
+          //   });
+        }
+      });
+    },
+    cancel(flag = false) {
+      this.$emit('cancel', flag);
+      this.formData = {};
+      this.$refs.form.resetFields();
+    },
+  },
+};
+</script>

src/views/productionManagement/workReportingManagement/components/wordReporting.vue

@@ -66,6 +66,7 @@
           value-key="id"
           search-key="id"
           :debounce-time="500"
+          :title="'修改'"
           @change="(value, item) => changeTs(value, item, scope.row)"
         />
       </template>
@@ -86,6 +87,7 @@
           value-key="id"
           search-key="id"
           :debounce-time="500"
+          :title="'修改'"
           @change="(value, item) => changeUser(value, item, scope.row)"
         />
         <div v-else>-</div>