生产处置单逻辑添加

src/api/qualityManagement/productionTesting/productionDisposition.js

@@ -53,4 +53,22 @@ export const createProductionDisposition = (data) => {
     method: 'post',
     data
   });
+};
+
+// 历史订单下拉列表
+export const getHistoryOrderList = (data) => {
+  return request({
+    url: '/api/blade-desk/QA/ReviewSheet/getHisWOList',
+    method: 'post',
+    data
+  });
+};
+
+// 根据历史订单赋值
+export const setHistoryOrderValue = (params) => {
+  return request({
+    url: '/api/blade-desk/QA/ReviewSheet/sameCopyFromHiWO',
+    method: 'get',
+    params
+  });
 };

src/api/qualityManagement/productionTesting/reviewFormMess.js

@@ -0,0 +1,11 @@
+// 审理单查询
+import request from '@/axios';
+
+// 查询内部审理单查询
+export const getInnerReviewList = (data) => {
+  return request({
+    url: '/api/blade-desk/QA/ReviewSheet/listReviewRedoScrap',
+    method: 'post',
+    data
+  });
+};

src/views/productionDisposition/hearingDialog.vue

@@ -9,9 +9,10 @@
         </div>
         <div class="test_type" v-if="testType == 1">
             <span>历史订单：</span>
-            <el-select v-model="value" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'">
+            <el-select v-model="detailInfo.refWoId" placeholder="请选择" style="width: 400px;" :disabled="type == 'view'"
-                <el-option label="订单1" value="1" />
+            @change="changeHistoryOrder">
-                <el-option label="订单2" value="2" />
+                <el-option v-for="item in historyList" :key="item.woId"  :label="item.woInfo" :value="item.woId" />
+                <!-- <el-option label="订单2" value="2" /> -->
             </el-select>
         </div>
         <el-descriptions  title="订单信息" border :column="4" label-width="110">
@@ -287,19 +288,19 @@
         <template #footer>
             <span class="dialog-footer">
                 <el-button plain @click="closeDialog">取消</el-button>
-                <el-button type="primary" v-if="testType == 1 && type != 'view'" @click="submit(-1)">保存</el-button>
+                <el-button type="primary" v-if="testType == 1 && type != 'view'" @click="submit(21)">保存</el-button>
                 <el-button type="primary" v-if="testType == 2 && type != 'view'" @click="submitInside">提交</el-button>
-                <el-button type="primary" v-if="testType == 1 && type != 'view'" plain @click="submit(1)">提交质保</el-button>
+                <el-button type="primary" v-if="testType == 1 && type != 'view'" plain @click="submit(22)">提交质保</el-button>
-                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(2)">提交工艺</el-button>
+                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(23)">提交工艺</el-button>
-                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(3)">提交设计</el-button>
+                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(24)">提交设计</el-button>
-                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(4)">提交设计变更</el-button>
+                <el-button type="primary" v-if="testType == 1 && type != 'view'"  plain @click="submit(25)">提交设计变更</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
 <script>
 import {getFaultClassList,getQuestionClassList,getQuestionClassList2,getProductionDispositionDetail,
-createProductionDisposition} from "@/api/qualityManagement/productionTesting/productionDisposition"
+createProductionDisposition,getHistoryOrderList,setHistoryOrderValue} from "@/api/qualityManagement/productionTesting/productionDisposition"
 export default {
     props: {
         showDialog: {
@@ -333,6 +334,7 @@ export default {
             errorSmallArr:[],   //问题小类
             detailInfo:{},
             checkList:[],
+            historyList:[],
         }
     },
     mounted() {
@@ -340,14 +342,34 @@ export default {
         this.getError()
         this.getQuestionBig()
         this.getDetail()
+        this.getHistory()
         // this.getQuestionSmall()
     },
     methods: {
+        // 获取历史订单
+        getHistory(){
+            getHistoryOrderList({}).then(res =>{
+                this.historyList = res.data.data
+            })
+        },
+        // 修改历史订单
+        changeHistoryOrder(val){
+            setHistoryOrderValue({
+                id:this.rsId,
+                woId:val
+            }).then(res =>{
+                console.log('res1----------------',res)
+                getProductionDispositionDetail({
+                    woId:val
+                }).then(res =>{
+                    console.log('res2--------------------------------',res)
+                })
+            })
+        },
         getDetail(){
             getProductionDispositionDetail({
                 id:this.rsId
             }).then(res =>{
-                console.log('res---------------',res)
                 this.detailInfo = res.data.data
                 this.testType = res.data.data.bizType == 3 ? 1 : 2
                 this.disposalType = res.data.data.bizType == 3 ? '' : res.data.data.bizType
@@ -404,6 +426,7 @@ export default {
             this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
             this.detailInfo.faultList = this.faultList
             this.detailInfo.dutyList = this.dutyList
+            this.detailInfo.submitType = val
             console.log('detail---------------------',this.detailInfo)
         },
         // 内部审理提交
@@ -423,6 +446,7 @@ export default {
             this.detailInfo.isClassicProblem = this.checkList.includes('isClassicProblem') ? 1 : 0
             this.detailInfo.isLowError = this.checkList.includes('isLowError') ? 1 : 0
             this.detailInfo.isQualityProblem = this.checkList.includes('isQualityProblem') ? 1 : 0
+            this.detailInfo.submitType = 10
             console.log('detailInfo-----------------',this.detailInfo)
             createProductionDisposition(this.detailInfo).then(res =>{
                 if(res.data.code == 200){

src/views/productionDisposition/index.vue

@@ -412,21 +412,26 @@ export default {
                                 trigger: 'click',
                             },
                         ],
-                        dicData: [
+                        props:{
-                            {
+                            label:'dictValue',
-                                value: 1,
+                            value:'dictKey',
-                                label: '新建'
+                        },
-                            }, {
+                        dicUrl:'/api/blade-system/dict/dictionary?code=ReviewSheet-Status', //字典中取值
-                                value: 3,
+                        // dicData: [
-                                label: '打回'
+                        //     {
-                            }, {
+                        //         value: 1,
-                                value: 6,
+                        //         label: '新建'
-                                label: '审理中'
+                        //     }, {
-                            }, {
+                        //         value: 3,
-                                value: 10,
+                        //         label: '打回'
-                                label: '审理完成'
+                        //     }, {
-                            }
+                        //         value: 6,
-                        ]
+                        //         label: '审理中'
+                        //     }, {
+                        //         value: 10,
+                        //         label: '审理完成'
+                        //     }
+                        // ]
                     },
                     {
                         label: '打回人',

src/views/qualityManagement/reviewFormMess/index.vue

@@ -22,7 +22,7 @@
                 </avue-crud>
             </el-tab-pane>
             <el-tab-pane label="内部审理" name="insideHear">
-                <avue-crud :option="insideOption" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+                <avue-crud :option="insideOption" :table-loading="loading" :data="insideData" v-model="form" v-model:page="insidePage" ref="crud"
                     @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
                     @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
                     @refresh-change="refreshChange" @on-load="onLoad">
@@ -30,6 +30,10 @@
                     </template>
                     <template #menu-right>
                     </template>
+                    <template #qty="{row}">
+                        <span v-if="row.bizType == 1">{{row.reDoNum}}</span>
+                        <span v-if="row.bizType == 2">{{row.scrapNum}}</span>
+                    </template>
                     <template #menu="{ row }">
                         <el-button type="text">审理</el-button>
                     </template>
@@ -58,6 +62,7 @@ import {
 import { mapGetters } from 'vuex';
 import { validatenull } from '@/utils/validate';
 import {insideOption,erpOption} from './options'
+import {getInnerReviewList} from "@/api/qualityManagement/productionTesting/reviewFormMess"
 
 export default {
     components: {
@@ -98,9 +103,32 @@ export default {
             data: [],
             isRushOpen: false,//加急弹框
             isBatchOpen: false,//分批处理
+            insideData:[],
+            insidePage:{
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
+            }
         };
     },
     methods: {
+        tabPositionChange(){
+            if(this.tabPosition == 'erpHear'){
+
+            }else if(this.tabPosition == 'insideHear'){
+                this.getInsideList()
+            }
+        },
+        getInsideList(){
+            getInnerReviewList({
+                current:this.insidePage.currentPage,
+                size:this.insidePage.pageSize,
+                bizType:0
+            }).then(res =>{
+                this.insideData = res.data.data.records
+                this.insidePage.total = res.data.data.total
+            })
+        },
         // 批量接收
         batchReceiving() {
             this.$confirm('确定将选择数据批量接收?', {

src/views/qualityManagement/reviewFormMess/options.js

@@ -43,7 +43,7 @@ export const insideOption = {
     column: [
         {
             label: '审理单号',
-            prop: 'partCode',
+            prop: 'rsCode',
             // bind: 'dsPart.partCode',
             search: true,
             sortable: true,
@@ -61,7 +61,7 @@ export const insideOption = {
         },
         {
             label: '物料号',
-            prop: 'productCode',
+            prop: 'partCode',
             search: true,
             sortable: true,
             span: 12,
@@ -93,7 +93,7 @@ export const insideOption = {
         },
         {
             label: '供应商代码',
-            prop: 'ocCode',
+            prop: 'oemCode',
             search: false,
             sortable: true,
             span: 12,
@@ -101,7 +101,7 @@ export const insideOption = {
         },
         {
             label: '供应商名称',
-            prop: 'ocName',
+            prop: 'oemName',
             search: true,
             sortable: true,
             span: 12,
@@ -109,7 +109,7 @@ export const insideOption = {
         },
         {
             label: '审理类型',
-            prop: 'testType',
+            prop: 'bizType',
             type:'select',
             search: true,
             sortable: true,
@@ -164,7 +164,7 @@ export const insideOption = {
         },
         {
             label: '审理结论',
-            prop: 'result',
+            prop: 'memo',
             search: false,
             sortable: true,
             span: 12,
@@ -172,7 +172,7 @@ export const insideOption = {
         },
         {
             label: '提请人员',
-            prop: 'crUserRealName',
+            prop: 'createUserRealName',
             search: false,
             sortable: true,
             span: 12,
@@ -212,7 +212,7 @@ export const insideOption = {
         },
         {
             label: '镀前价格',
-            prop: 'price',
+            prop: 'priceBeforePlate',
             search: false,
             sortable: true,
             span: 12,