zhuwei 1 жил өмнө
parent
commit
12a90f16ce

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "20230607160059",
-    "target1": "http://192.168.0.102:8090",
-    "target": "http://39.108.216.210:8090",
+    "target": "http://192.168.0.102:8090",
+    "target1": "http://39.108.216.210:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

+ 1 - 1
src/views/tentative/detect/commission.vue

@@ -463,7 +463,7 @@ const rowActionSave = async () => {
     const { primaryKeyId } = nodeDataInfo.value
     setStoreValue('testTreeItem', nodeDataInfo.value)
     setStoreValue('prenodeDataInfo', nodeDataInfo.value)
-    const { error, code, msg } = await mainApi.update({ id, expCount, sampleStatus: 4 })
+    const { error, code, msg } = await mainApi.update({ id, expCount})
     if (!error && code === 200) {
         window.$message.success('创建成功')
         rowActionLoading.value = false

+ 1 - 1
src/views/tentative/detect/components/linkAssociation.vue

@@ -215,7 +215,7 @@ const linkCountClick = async () => {
     const isForm = await formValidate(formRef.value)
     if (!isForm) return
     const { id, expCount } = formModel.value
-    const { error, code, msg } = await mainApi.update({ id, expCount, sampleStatus: 4 })
+    const { error, code, msg } = await mainApi.update({ id, expCount})
     if (!error && code === 200) {
         window.$message.success('选择成功')
         curId.value = currentId.value

+ 1 - 1
src/views/tentative/material/modules/testSample/testUnder.vue

@@ -158,7 +158,7 @@ const tableColumn = ref([
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
-    { key: 'no-key', name: '剩余数量', align: 'center' },
+    { key: 'sxCount', name: '剩余数量', align: 'center' },
     { key: 'calculationUnit', name: '计算单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },

+ 2 - 2
src/views/tentative/material/modules/testSample/tested.vue

@@ -156,7 +156,7 @@ const tableColumn = ref([
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
     { key: 'userName', name: '取样人', align: 'center' },
-    { key: 'no-key', name: '待测时间', align: 'center' },
+    { key: 'ctestTime', name: '待测时间', align: 'center' },
     { key: 'action', name: '操作', width: 150, align: 'center' },
 ])
 const tableData = ref([])
@@ -217,7 +217,7 @@ const rowActionSave = async () => {
     if (!isForm) return
     saveLoading.value = true
     const { id, expCount } = formModel.value
-    let form = { id, expCount, sampleStatus: 4 }
+    let form = { id, expCount }
     const { error, code, msg } = await mainApi.update(form)
     saveLoading.value = false
     if (!error && code === 200) {