外协及计划修改

src/api/outsourcingManagement/oemOrder.js

@@ -89,3 +89,12 @@ export const turnQuality = (data) =>{
     data
   })
 }
+
+// 转厂内
+export const turnIn = (data) =>{
+  return request({
+    url:"/api/blade-desk/workOrder/transferBill",
+    method:"post",
+    data
+  })
+}

src/views/oem/oemOrder/turnFacInner.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog title="转厂内" v-model="setCrewShow" :before-close="cancel" width="1050px">
-        <avue-form :option="option"></avue-form>
+        <avue-form :option="option" :model="turnForm" ref="form"></avue-form>
         <avue-crud :option="optionTable" :table-loading="loading" :data="data" v-model="form" v-model:page="page"
             ref="crud" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
             @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@@ -9,13 +9,13 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="cancel()">取消</el-button>
-                <el-button type="primary" @click="submit()"> 确认</el-button>
+                <el-button type="primary" @click="submit"> 确认</el-button>
             </div>
         </template>
     </el-dialog>
 </template>
 <script>
-import {getInProcess} from "@/api/outsourcingManagement/oemOrder"
+import {getInProcess,turnIn} from "@/api/outsourcingManagement/oemOrder"
 export default {
     props: {
         turnFacInnerOpen: {
@@ -43,8 +43,8 @@ export default {
                 searchMenuSpan: 6,
                 dialogWidth: '60%',
                 border: true,
-                selection: false,
-                index: true,
+                index: false,
+                selection:true,
                 menuWidth: 240,
                 dialogClickModal: false,
                 excelBtn: true,
@@ -74,7 +74,7 @@ export default {
                     {
                         label: '工序号',
                         prop: 'orders',
-                        bind: 'prWorkPlan.orders',
+                        // bind: 'prWorkPlan.orders',
                         search: false,
                         sortable: true,
                         overHidden: true,
@@ -82,8 +82,8 @@ export default {
                     },
                     {
                         label: '工序代码',
-                        prop: 'prWorkPlan.procedureSet.ppsCode',
-                        bind: 'prWorkPlan.procedureSet.ppsCode',
+                        prop: 'code',
+                        bind: 'workPlan.processSet.code',
                         search: false,
                         sortable: true,
                         overHidden: true,
@@ -91,40 +91,32 @@ export default {
                     },
                     {
                         label: '工序名称',
-                        prop: 'prWorkPlan.procedureSet.ppsName',
-                        bind: 'prWorkPlan.procedureSet.ppsName',
+                        prop: 'name',
+                        bind: 'workPlan.processSet.name',
                         search: false,
                         sortable: true,
                         overHidden: true,
                         width: 120,
                     },
                     {
-                        label: '厂内生产',
-                        prop: 'handle',
+                        label: '工艺能力',
+                        prop: 'processAbilityName',
+                        bind:"processAbility.name",
                         search: false,
                         sortable: true,
                         overHidden: true,
                         width: 120,
                     },
                     {
-                        label: '计划开始时间',
-                        prop: 'startTime',
-                        search: false,
-                        sortable: true,
-                        overHidden: true,
-                        width: 140,
-                    },
-                    {
-                        label: '计划结束时间',
-                        prop: 'endTime',
+                        label: '工序描述',
+                        prop: 'makeMemo',
                         search: false,
                         sortable: true,
                         overHidden: true,
-                        width: 140,
                     },
                     {
-                        label: '工序描述',
-                        prop: 'makeMemo',
+                        label: '不可转厂内原因',
+                        prop: 'reason',
                         search: false,
                         sortable: true,
                         overHidden: true,
@@ -144,14 +136,15 @@ export default {
                         rules: [
                             {
                                 required: true,
-                                message: '请备注',
+                                message: '请输入备注',
                                 trigger: 'blur'
                             }
                         ]
                     },
 
                 ]
-            }
+            },
+            selectionList:[]
         };
     },
     mounted() {
@@ -167,6 +160,9 @@ export default {
                 this.data = res.data.data
             })
         },
+        selectionChange(list){
+            this.selectionList = list
+        },
         takeBack() {
             // this.$refs.form.validate((valid) => {
             //     if (valid) {
@@ -197,6 +193,38 @@ export default {
             //   this.$refs.form.resetFields();
             this.$emit('cancel', typeof isRefresh === 'boolean' && isRefresh);
         },
+
+        submit(){
+            if (this.data.length == 0) {
+                this.$message.error('当前数据列表为空');
+                return;
+            }
+            this.$refs.form.validate((valid) => { 
+                if (valid) { 
+                    if(this.selectionList.length == 0){
+                        this.$message.error('请选择要转厂内的工序')
+                        return
+                    }
+
+                    let query = {
+                        workOrderRuns: [
+                            {
+                                runType:2,
+                                woId:this.rowItem.woId
+                            }
+                        ],
+                        workPlanRuns: this.selectionList,
+                    };
+                    turnIn(query).then(res =>{
+                        if(res.data.code == 200){
+                            this.$message.success('转厂内成功');
+                            this.cancel(true);
+                        }
+                    })
+                }
+            });
+        },
+
         onLoad() {
 
         }

src/views/orderManagement/components/exception/dataMissing.vue

@@ -200,7 +200,7 @@ export default {
               value:'partCode'
             },
             onChange:val =>{
-              this.form.partName = val.item.partName
+              this.form.partName = val && val.item && val.item.partName
             },
             rules: [
               {