0227

src/views/business/daywork/form.vue

@@ -378,6 +378,7 @@ const open = (row) => {
   reset();
   loading.value = true;
   if (row.id) {
+    //页面操作是编辑还是删除
     editStatus.value = row.editStatus;
     detailInfo.value = proxy.deepClone(row);
     //是否是当前工序

src/views/business/daywork/index.vue

@@ -72,7 +72,8 @@
             </el-table-column>
             <el-table-column fixed="right" label="操作" align="center" width="70px">
               <template #default="scope">
-                <el-button link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.status ==2 || scope.row.status == 3" link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑</el-button>
+                <el-button v-else link type="primary" icon="View" @click="handleCheckDayworkItem(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -162,6 +163,7 @@ function getDayworks() {
     }
   })
 }
+//查询报工信息数据
 function handleGetDayworkItems() {
   dayworkLoading.value = true
   listDaywork(queryDayworkParams.value).then((res) => {
@@ -187,10 +189,11 @@ function handleGetDayworkItems() {
     proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[index])
   })
 }
+//切换工段
 function handleDeptChange() {
   getDayworks()
 }
-
+//修改
 function handleUpdateDayworkItem(row) {
   row.technologicalProcessId = queryItemParams.value.technologicalProcessId
   row.deptId = queryDayworkParams.value.deptId
@@ -203,6 +206,25 @@ function handleUpdateDayworkItem(row) {
   } else {
     row.currentDept = false
   }
+  //修改向form表单传一个状态值
+  row.editStatus = true
+  proxy.$refs.dayworkItemRef.open(row)
+}
+//查看
+function handleCheckDayworkItem(row) {
+  row.technologicalProcessId = queryItemParams.value.technologicalProcessId
+  row.deptId = queryDayworkParams.value.deptId
+  row.productionPlanDetailId = currentDaywork.value.productionPlanDetailId
+  row.dayworkId = currentDaywork.value.id
+  row.lotId = currentDaywork.value.lotId
+  //判断是否是当前工段
+  if (row.deptId == currentDaywork.value.deptId) {
+    row.currentDept = true
+  } else {
+    row.currentDept = false
+  }
+  //修改向form表单传一个状态值
+  row.editStatus = false
   proxy.$refs.dayworkItemRef.open(row)
 }
 

src/views/business/department/form.vue

@@ -48,7 +48,7 @@ const disabled = ref(false)
 const data = reactive({
   form: {},
   rules: {
-    // parentId: [ { required: true, message: '请选择上级部门', trigger: 'blur' }],
+    parentId: [ { required: true, message: '请选择上级部门', trigger: 'blur' }],
     deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
     deptCode: [{ required: true, message: '部门编码不能为空', trigger: 'blur' }],
     orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }]