Browse Source

fix:导出添加说明列,列表显示状态修改

ly 11 tháng trước cách đây
mục cha
commit
a109e8d34b

+ 1 - 1
src/views/business/production/onceWork/index.vue

@@ -134,7 +134,7 @@
         <template #default="scope">
           <el-button link type="primary" size="small" @click="viewOnWorkDetail(scope.row,true)"
                      >{{textFormat(scope.row.onWorkDetail)}}</el-button>
-          <el-button v-if="scope.row.record != null&&scope.row.record.status !== 3&&scope.row.record.handlerId  ===  useUserStore().user.userId" style="margin: 0" link type="primary" icon="Edit"
+          <el-button v-if="scope.row.record != null&&scope.row.record.status !== 3&&scope.row.record.status !== 4&&scope.row.record.handlerId  ===  useUserStore().user.userId" style="margin: 0" link type="primary" icon="Edit"
                      @click="viewOnWorkDetail(scope.row,false)" />
         </template>
       </el-table-column>

+ 6 - 1
src/views/business/production/onceWork/resultDialog.vue

@@ -200,7 +200,12 @@ function openView(id,status,userId,resultStatus,view){
   uploadHidden.value = true;
   workOrderId.value = id;
   sumbitForm.recordStatus = status;
-  sumbitForm.resultStatus = resultStatus;
+  if(resultStatus !== -1){
+    sumbitForm.resultStatus = resultStatus;
+  }else{
+    sumbitForm.resultStatus = null;
+  }
+
   sumbitForm.file = null;
   formHidden.value = status;
   falg.value = view;