Quellcode durchsuchen

获取材料编号修改

duy vor 3 Monaten
Ursprung
Commit
ba18544289

+ 30 - 2
src/views/tentative/material/approach.vue

@@ -30,7 +30,7 @@
                         <span>删除</span>
                     </el-button>
                 </HcTooltip>
-                <HcTooltip keys="tentative_material_approach_printer">
+                <!-- <HcTooltip keys="tentative_material_approach_printer">
                     <el-button
                         :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722"
                         @click="printerClick"
@@ -44,7 +44,7 @@
                         <HcIcon name="folder-upload" />
                         <span>导入</span>
                     </el-button>
-                </HcTooltip>
+                </HcTooltip> -->
             </template>
             <template #search>
                 <div class="w-40">
@@ -286,10 +286,12 @@ import HcDragUpload from './components/HcDragUpload.vue'
 import FormItemUpload from './components/FormItemUpload.vue'
 import notableform from '~src/assets/view/notableform.svg'
 import approachApi from '~api/tentative/material/approach'
+import dataApi from '~api/basic/code'
 import { arrIndex, arrToId, deepClone, formValidate, getArrValue, isNullES } from 'js-fast-way'
 import { getDictionary } from '~api/other'
 import { toPdfPage } from '~uti/btn-auth'
 import Dayjs from 'dayjs'
+import { getObjVal } from 'js-fast-way'
 
 //初始变量
 const useAppState = useAppStore()
@@ -424,6 +426,29 @@ const addFormModalClick = () => {
         mobilizationDate: new Dayjs().format('YYYY-MM-DD'),
     }
     addEditFormModal.value = true
+    getMaterialNumber()
+
+}
+//获取材料编号
+const backObj = ref({})
+const getMaterialNumber = async () => {
+        const { error, code, data } = await dataApi.getTrialNumber({
+        projectId: projectId.value,
+        contractId: contractId.value,
+        type: 1,
+     
+        
+    })
+    //处理数据
+    
+    if (!error && code === 200) {
+      backObj.value = getObjVal(data)
+
+
+    } else {
+        backObj.value = {}
+
+    }
 }
 //编辑 材料进场
 const editFormModalClick = () => {
@@ -537,6 +562,9 @@ const addEditFormClick = async () => {
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
+            trialAutoNumber: backObj.value?.trialAutoNumber,
+            autoIncrementNumber: backObj.value?.autoIncrementNumber,
+           
         })
         //处理数据
 

+ 29 - 4
src/views/tentative/material/sampling.vue

@@ -52,7 +52,7 @@
                         <span>删除</span>
                     </el-button>
                 </hc-tooltip>
-                <hc-tooltip keys="tentative_material_sampling_printer">
+                <!-- <hc-tooltip keys="tentative_material_sampling_printer">
                     <el-button :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722" @click="printerClick">
                         <hc-icon name="printer" />
                         <span>打印</span>
@@ -63,7 +63,7 @@
                         <hc-icon name="folder-upload" />
                         <span>导入</span>
                     </el-button>
-                </hc-tooltip>
+                </hc-tooltip> -->
                 <hc-tooltip keys="tentative_material_sampling_delegation">
                     <el-button hc-btn color="#E75643" :disabled="!nodeErTreeId" @click="delegationClick">
                         <hc-icon name="slack" />
@@ -281,10 +281,10 @@ import commissionApi from '~api/tentative/detect/commission'
 import samplingApi from '~api/tentative/material/sampling'
 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 { arrIndex, arrToId, deepClone, formValidate, getArrValue, getObjVal, getObjValue, isNullES, isString } from 'js-fast-way'
 import { toPdfPage } from '~uti/btn-auth'
 import Dayjs from 'dayjs'
-
+import dataApi from '~api/basic/code'
 //变量
 const useAppState = useAppStore()
 const userInfo = ref(useAppState.getUserInfo)
@@ -476,9 +476,31 @@ const addFormModalClick = () => {
         userId: userInfo.value.user_id,
     }
     addEditFormModal.value = true
+    getMaterialNumber()
+
     requestDevice()
 }
+//获取材料编号
+const backObj = ref({})
+const getMaterialNumber = async () => {
+        const { error, code, data } = await dataApi.getTrialNumber({
+        projectId: projectId.value,
+        contractId: contractId.value,
+        type: 2,
+        nodeId:primaryKeyId.value,
+        
+    })
+    //处理数据
+    
+    if (!error && code === 200) {
+      backObj.value = getObjVal(data)
+
+
+    } else {
+        backObj.value = {}
 
+    }
+}
 //编辑
 const editFormModalClick = () => {
     const keys = tableCheckedKeys.value
@@ -624,6 +646,9 @@ const addEditFormClick = async () => {
     }
     form.projectId = projectId.value
     form.contractId = searchForm.value.contractId
+    form.trialAutoNumber = backObj.value?.trialAutoNumber
+    form.autoIncrementNumber = backObj.value?.autoIncrementNumber
+
     const { error, code, msg } = await samplingApi.submitForm(form)
     //处理数据
     addEditFormLoading.value = false