修改bug

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240517114247"
+  "value": "20240528163659"
 }

src/views/tentative/detect/commission.vue

@@ -57,8 +57,9 @@
                 <template #action="{ row }">
                     <el-link v-if="row.status === 1" type="primary" @click="rowEdit(row)">修改</el-link>
                     <el-link v-else type="success" @click="rowView(row)">查看</el-link>
-                    <el-link v-if="isNullES(row.testId)" type="danger" :disabled="row.status !== 1" @click="rowReports(row)">创建报告</el-link>
-                    <el-link v-else type="danger" :disabled="row.status !== 1" @click="rowFillReports(row)">填写报告</el-link>
+                    <el-link v-if="row.status === 4" type="info" disabled>创建成功</el-link>
+                    <el-link v-else-if="!isNullES(row.testId)" type="danger" :disabled="row.status !== 3" @click="rowFillReports(row)">填写报告</el-link>
+                    <el-link v-else type="danger" :disabled="row.status !== 3" @click="rowReports(row)">创建报告</el-link>
                 </template>
             </hc-table>
             <template #action>

src/views/tentative/material/approach.vue

@@ -295,6 +295,7 @@ import approachApi from '~api/tentative/material/approach'
 import { arrIndex, arrToId, deepClone, formValidate, getArrValue } from 'js-fast-way'
 import { getDictionary } from '~api/other'
 import { toPdfPage } from '~uti/btn-auth'
+import Dayjs from 'dayjs'
 
 //初始变量
 const useAppState = useAppStore()
@@ -422,7 +423,9 @@ const tableSelection = (rows) => {
 //新增 材料进场
 const addEditFormModal = ref(false)
 const addFormModalClick = () => {
-    addEditFormModel.value = {}
+    addEditFormModel.value = {
+        mobilizationDate: new Dayjs().format('YYYY-MM-DD'),
+    }
     addEditFormModal.value = true
 }
 //编辑 材料进场

src/views/tentative/material/sampling.vue

@@ -262,6 +262,7 @@ import approachApi from '~api/tentative/material/approach'
 import { getContractUserList, getDictionary } from '~api/other'
 import { arrIndex, arrToId, deepClone, formValidate, getArrValue, getObjValue, isNullES, isString } from 'js-fast-way'
 import { toPdfPage } from '~uti/btn-auth'
+import Dayjs from 'dayjs'
 
 //变量
 const useAppState = useAppStore()
@@ -438,9 +439,12 @@ const tableSelection = (rows) => {
 //新增
 const addEditFormModal = ref(false)
 const addFormModalClick = () => {
+    const toDayDate = new Dayjs().format('YYYY-MM-DD')
     addEditFormModel.value = {
         isOutsourcing: 0,
         mobilizationId: '',
+        mobilizationDate: toDayDate,
+        samplingDate: toDayDate,
         nodeId: primaryKeyId.value,
         userId: userInfo.value.user_id,
     }
@@ -741,9 +745,10 @@ const getApproachTableData = async () => {
 
 //关联
 const linksApproachRow = (row) => {
+    const toDayDate = new Dayjs().format('YYYY-MM-DD')
     const form = addEditFormModel.value
     form.materialName = row.materialName ?? '' //样品名称
-    form.mobilizationDate = row.mobilizationDate ?? null //进场日期
+    form.mobilizationDate = row.mobilizationDate ?? toDayDate //进场日期
     form.specificationNumber = row.materialNumber ?? '' //样品编号
     form.specificationModel = row.specificationModel ?? '' //规格型号
     form.supplierUnit = row.supplierUnit ?? '' //供应商