修复请托bug和新增报工查看详情显示班组

src/views/produce/components/feeding/details.vue

@@ -27,6 +27,10 @@
               >
             </div>
           </div>
+
+          <div class="item_box rx-bc">
+            <div class="time">班组名称： {{ item.teamName }}</div>
+          </div>
         </div>
 
         <div v-for="(it, idx) in item.orderInfoList" :key="idx">

src/views/produce/components/feeding/index.vue

@@ -361,6 +361,7 @@
         teamUserList: [],
         executorIdList: [],
         teamId: '',
+        teamName: '',
         isDefaultExecutor: false,
         checked: false,
         pickerOptions: {
@@ -602,6 +603,7 @@
       setDefaultIdList() {
         if (this.teamList.length != 0) {
           this.teamId = this.teamList[0].id;
+          this.teamName = this.teamList[0].name;
           const index = this.teamList.findIndex(
             (item) => item.id == this.teamId
           );
@@ -628,6 +630,7 @@
       checkTeamList(id) {
         this.executorIdList = [];
         const index = this.teamList.findIndex((item) => item.id == id);
+        this.teamName = this.teamList[index].name;
         this.teamUserList = this.teamAllList[index];
       },
 
@@ -792,6 +795,8 @@
 
         this.List = this.List.map((item) => {
           item.executorList = executorList;
+          item.teamId = this.teamId;
+          item.teamName = this.teamName;
           return item;
         });
 

src/views/produce/components/jobBooking/details.vue

@@ -57,6 +57,12 @@
               >
             </div>
           </div>
+
+          <div class="item_box rx-bc">
+            <div class="time"
+              >班组名称： {{ objData.workReportInfo.teamName }}</div
+            >
+          </div>
         </div>
 
         <paramBom

src/views/produce/components/jobBooking/index.vue

@@ -670,6 +670,7 @@
         teamUserList: [],
         executorIdList: [],
         teamId: '',
+        teamName: '',
         checked: false,
         isReportTime: false,
         reportTime: '',
@@ -854,6 +855,7 @@
       setDefaultIdList() {
         if (this.teamList.length != 0) {
           this.teamId = this.teamList[0].id;
+          this.teamName = this.teamList[0].name;
           const index = this.teamList.findIndex(
             (item) => item.id == this.teamId
           );
@@ -1316,6 +1318,7 @@
       checkTeamList(id) {
         this.executorIdList = [];
         const index = this.teamList.findIndex((item) => item.id == id);
+        this.teamName = this.teamList[index].name;
         this.teamUserList = this.teamAllList[index];
       },
 
@@ -1425,6 +1428,8 @@
 
         this.List = this.List.map((item) => {
           item.workReportInfo.executorList = executorList;
+          item.workReportInfo.teamId = this.teamId;
+          item.workReportInfo.teamName = this.teamName;
           return item;
         });
 
@@ -1844,6 +1849,7 @@
             this.checked = false;
             this.executorIdList = [];
             this.teamId = '';
+            this.teamName = '';
             this.getList(this.idsList);
             this.$emit('jobSuccess', 'Success');
           })

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -32,19 +32,19 @@
         </el-col>
 
         <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
-          <el-form-item label="产品编码：">
+          <el-form-item label="顶层产品编码：">
             <el-input v-model="form.topCategoryCode" disabled></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
-          <el-form-item label="零件名称：">
+          <el-form-item label="产品名称：">
             <el-input v-model="form.productName" disabled></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
-          <el-form-item label="零部件编码：">
+          <el-form-item label="产品编码">
             <el-input v-model="form.productCode" disabled></el-input>
           </el-form-item>
         </el-col>
@@ -57,7 +57,10 @@
 
         <el-col :lg="8" :md="12" :sm="12" :xl="8" :xs="12">
           <el-form-item label="首件编码：" prop="firstArticleCode">
-            <el-input v-model="form.firstArticleCode"></el-input>
+            <el-input
+              v-model="form.firstArticleCode"
+              :disabled="mode == 'detail'"
+            ></el-input>
           </el-form-item>
         </el-col>
 
@@ -68,6 +71,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="yyyy-MM-dd HH:mm:ss"
+              :disabled="mode == 'detail'"
             >
             </el-date-picker>
           </el-form-item>
@@ -80,6 +84,7 @@
               type="datetime"
               placeholder="选择日期"
               value-format="yyyy-MM-dd HH:mm:ss"
+              :disabled="mode == 'detail'"
             >
             </el-date-picker>
           </el-form-item>
@@ -91,7 +96,10 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="工艺、图纸是否有效：" label-width="200px">
-            <el-radio-group v-model="form.processDrawingValid">
+            <el-radio-group
+              v-model="form.processDrawingValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -104,7 +112,10 @@
 
         <el-col :span="12">
           <el-form-item label="设备是否完好：" label-width="200px">
-            <el-radio-group v-model="form.deviceValid">
+            <el-radio-group
+              v-model="form.deviceValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -117,7 +128,10 @@
 
         <el-col :span="12">
           <el-form-item label="工装是否合格：" label-width="200px">
-            <el-radio-group v-model="form.toolingQualifiedValid">
+            <el-radio-group
+              v-model="form.toolingQualifiedValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -130,7 +144,10 @@
 
         <el-col :span="12">
           <el-form-item label="量具是否合格并在有效期内：" label-width="200px">
-            <el-radio-group v-model="form.measuringToolValid">
+            <el-radio-group
+              v-model="form.measuringToolValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -143,7 +160,10 @@
 
         <el-col :span="12">
           <el-form-item label="数控程序是否确认：" label-width="200px">
-            <el-radio-group v-model="form.ncProgramValid">
+            <el-radio-group
+              v-model="form.ncProgramValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -156,7 +176,10 @@
 
         <el-col :span="12">
           <el-form-item label="原材料或半成品是否合格：" label-width="200px">
-            <el-radio-group v-model="form.materialSemiFinishedValid">
+            <el-radio-group
+              v-model="form.materialSemiFinishedValid"
+              :disabled="mode == 'detail'"
+            >
               <el-radio
                 :label="item.value"
                 v-for="(item, i) in radioList"
@@ -262,7 +285,7 @@
             size="mini"
             v-model="row.selfCheckDesc"
             placeholder="请输入"
-            :disabled="row.status != 0"
+            :disabled="row.status != 0 || mode == 'detail'"
           />
         </template>
 
@@ -271,7 +294,7 @@
             size="mini"
             v-model="row.selfCheckResult"
             filterable
-            :disabled="row.status != 0"
+            :disabled="row.status != 0 || mode == 'detail'"
             placeholder="请选择"
           >
             <el-option
@@ -290,7 +313,7 @@
             v-model="row.specialCheckResult"
             filterable
             placeholder="请选择"
-            :disabled="row.status != 2"
+            :disabled="row.status != 2 || mode == 'detail'"
           >
             <el-option
               v-for="item in option"
@@ -306,14 +329,14 @@
           <el-input
             size="mini"
             v-model="row.specialCheckDesc"
-            :disabled="row.status != 2"
+            :disabled="row.status != 2 || mode == 'detail'"
             placeholder="请输入"
           />
         </template>
       </ele-pro-table>
     </el-form>
 
-    <span slot="footer" class="dialog-footer">
+    <span slot="footer" class="dialog-footer" v-if="mode != 'detail'">
       <el-button @click="visible = false">取 消</el-button>
       <el-button type="primary" @click="saveSelf(1)">提交</el-button>
       <el-button type="primary" @click="saveSelf(2)">保存</el-button>
@@ -370,7 +393,8 @@
         item: null,
         type: '',
         selection: [],
-        title: ''
+        title: '',
+        mode: ''
       };
     },
 
@@ -457,10 +481,16 @@
         this.visible = false;
       },
 
-      open(item, type) {
+      open(item, type, mode) {
         this.item = item;
         this.type = type;
-        this.title = type == 1 ? '自检报工' : '专检报工';
+        this.mode = mode ? mode : '';
+        if (mode) {
+          this.title = type == 1 ? '自检报工详情' : '专检报工详情';
+        } else {
+          this.title = type == 1 ? '自检报工' : '专检报工';
+        }
+
         this.visible = true;
         this.getData();
       },

src/views/produce/components/qualityInspection/components/selfInspectionRequest.vue

@@ -111,6 +111,7 @@
       >
         <template v-slot:status="{ row }">
           <el-tag v-if="row.status == 0">待自检</el-tag>
+          <el-tag v-if="row.status == 1">请托中</el-tag>
           <el-tag v-if="row.status == 2">待专检</el-tag>
           <el-tag v-if="row.status == 3">已完成</el-tag>
         </template>

src/views/produce/components/qualityInspection/index.vue

@@ -30,6 +30,13 @@
               @click="reportClick(row, 1)"
               >{{ row.status == 0 ? '报工' : '已报工' }}</el-button
             >
+
+            <el-button
+              type="primary"
+              v-if="row.status == 2 || row.status == 3"
+              @click="reportClick(row, 1, 'detail')"
+              >详情</el-button
+            >
           </template>
 
           <template v-slot:specialInspection="{ row }">
@@ -37,7 +44,14 @@
               type="primary"
               :disabled="row.status != 2"
               @click="reportClick(row, 2)"
-              >报工</el-button
+              >{{ row.status == 3 ? '已报工' : '报工' }}</el-button
+            >
+
+            <el-button
+              type="primary"
+              v-if="row.status == 3"
+              @click="reportClick(row, 2, 'detail')"
+              >详情</el-button
             >
           </template>
 
@@ -155,7 +169,7 @@
             label: '状态',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 120
+            minWidth: 100
           },
 
           {
@@ -168,7 +182,7 @@
           {
             label: '专检报工',
             align: 'center',
-            width: 130,
+            width: 150,
             fixed: 'right',
             slot: 'specialInspection'
           }
@@ -246,8 +260,8 @@
         this.$refs.selfRequestRef.open(row);
       },
 
-      reportClick(row, type) {
-        this.$refs.selfReportingRef.open(row, type);
+      reportClick(row, type, mode) {
+        this.$refs.selfReportingRef.open(row, type, mode);
       }
     }
   };

src/views/produce/components/warehousing/index.vue

@@ -321,6 +321,7 @@
         teamUserList: [],
         executorIdList: [],
         teamId: '',
+        teamName: '',
         checked: false,
         pickerOptions: {
           disabledDate(time) {
@@ -540,6 +541,7 @@
       setDefaultIdList() {
         if (this.teamList.length != 0) {
           this.teamId = this.teamList[0].id;
+          this.teamName = this.teamList[0].name;
           const index = this.teamList.findIndex(
             (item) => item.id == this.teamId
           );
@@ -590,6 +592,7 @@
       checkTeamList(id) {
         this.executorIdList = [];
         const index = this.teamList.findIndex((item) => item.id == id);
+        this.teamName = this.teamList[index].name;
         this.teamUserList = this.teamAllList[index];
       },
 
@@ -728,6 +731,8 @@
 
         this.List = this.List.map((item) => {
           item.workReportInfo.executorList = executorList;
+          item.workReportInfo.teamId = this.teamId;
+          item.workReportInfo.teamName = this.teamName;
           return item;
         });
 
@@ -755,6 +760,7 @@
               this.checked = false;
               this.executorIdList = [];
               this.teamId = '';
+              this.teamName = '';
               this.loading.close();
               this.getList(this.idsList);
               this.$emit('warehouseSuccess', 'warehouseSuccess');