Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/api/checklistrecord/index.js

@@ -11,6 +11,17 @@ export async function checklistrecordPage(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+/**
+ *根据生产工单id查放行单列表
+ */
+export async function checklistByWorkOrderId(workOrderId) {
+  const res = await request.get(`/mes/checklistrecord/getByWorkOrderId/${workOrderId}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 // /mes/checklistrecord/save 保存
 export async function checklistrecordSave(data) {
   const res = await request.post('/mes/checklistrecord/save', data);

src/views/checklistManagement/checklist.vue

@@ -14,7 +14,7 @@
         @fullscreen-change="fullscreenChange"
       >
         <template v-slot:toolbar>
-          <el-button type="primary" size="mini" @click="openCheckAdd('add')"
+          <el-button v-if="!isDetails" type="primary" size="mini" @click="openCheckAdd('add')"
             >新建</el-button
           >
         </template>
@@ -71,7 +71,8 @@
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
   import {
     checklistrecordPage,
-    checklistrecordDelete
+    checklistrecordDelete,
+    checklistByWorkOrderId
   } from '@/api/checklistrecord/index';
   import checkAdd from './components/checkAdd.vue';
   import checkDetails from './components/checkDetails.vue';
@@ -81,6 +82,22 @@
   export default {
     mixins: [dictMixins, tableColumnsMixin],
     components: { checkAdd, checkDetails, processSubmitDialog },
+    props: {
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
+    props: {
+      workOrderInfo: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
     data() {
       return {
         columns: [
@@ -291,6 +308,9 @@
           pageNum: page,
           size: limit
         };
+        if(this.isDetails) {
+          return checklistByWorkOrderId(this.workOrderInfo.id)
+        }
         return checklistrecordPage(body);
       },
       search(where) {

src/views/produce/components/prenatalExamination/components/workOrder/programRulesEventDialog.vue

@@ -848,6 +848,17 @@
         return this.addForm.details;
       }
     },
+    watch: {
+      info: {
+        handler(newVal, oldVal) {
+          if (newVal.id) {
+            // this.getDetail(newVal.id);
+            this.open('dispatch', this.info)
+          }
+        },
+        deep: true
+      }
+    },
     created() {
       // 获取审核人列表、巡点检人员
       this.getUserList();

src/views/produceOrder/components/details/index.vue

@@ -93,6 +93,14 @@
               :workOrderInfo="workOrderInfo"
             ></recordRules>
           </el-tab-pane>
+          <el-tab-pane
+            label="放行单"
+          >
+           <checkList
+             :isDetails="true"
+            :workOrderInfo="workOrderInfo"
+           ></checkList>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </el-drawer>
@@ -108,6 +116,7 @@
   import productionDetails from '@/views//workOrderList/components/productionDetails.vue';
   import pickDetails from '../../details.vue';
   import recordRules from '../recordRules/recordRules.vue';
+  import checkList from '@/views/checklistManagement/checklist.vue'
 
   export default {
     components: {
@@ -116,7 +125,8 @@
       jobDetails,
       productionDetails,
       pickDetails,
-      recordRules
+      recordRules,
+      checkList
     },
     data() {
       return {