试验

public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240802175030"
+  "value": "20240805110800"
 }

src/config/index.json

@@ -2,8 +2,8 @@
     "version": "20230607160059",
     "target1": "http://127.0.0.1:8090",
     "target": "http://39.108.216.210:8090",
-    "target2": "http://192.168.0.125:8090",
-    "target3": "http://183.247.216.148:28090",
+    "target3": "http://192.168.0.125:8090",
+    "target4": "http://183.247.216.148:28090",
     "socket1": "wss://measure.hczcxx.cn/websocket",
     "smsPhone": "",
     "vite": {

src/views/tentative/material/modules/testSample/dispose.vue

@@ -111,9 +111,10 @@ const tableColumn = ref([
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
     { key: 'materialCount', name: '废除数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'entrustTime', name: '委托上报时间', align: 'center' },
     { key: 'carryTime', name: '入库时间', align: 'center' },
     { key: 'createTime', name: '创建试验时间', align: 'center' },

src/views/tentative/material/modules/testSample/flow.vue

@@ -110,9 +110,10 @@ const tableColumn = ref([
     { key: 'materialName', name: '样品名称' },
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'userName', name: '取样人', align: 'center' },
     { key: 'entrustTime', name: '委托单上报时间', align: 'center' },
 ])

src/views/tentative/material/modules/testSample/inventory.vue

@@ -169,9 +169,10 @@ const tableColumn = ref([
     { key: 'materialName', name: '样品名称' },
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'userName', name: '取样人', align: 'center' },
     { key: 'carryTime', name: '入库时间', align: 'center' },
     { key: 'action', name: '操作', width: 150, align: 'center' },

src/views/tentative/material/modules/testSample/leave.vue

@@ -134,9 +134,10 @@ const tableColumn = ref([
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
     { key: 'sxCount', name: '留样数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'resamTime', name: '留样时间', align: 'center' },
     { key: 'action', name: '操作', width: 150, align: 'center' },
 ])
@@ -185,7 +186,7 @@ const formRules = {
 const disposeModal = ref(false)
 const batchColumn = ref([
     { key: 'materialName', name: '样品名称' },
-    { key: 'key2', name: '留样数量' },
+    { key: 'no-key', name: '留样数量' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'resamTime', name: '留样时间' },
 ])

src/views/tentative/material/modules/testSample/testUnder.vue

@@ -159,9 +159,10 @@ const tableColumn = ref([
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
     { key: 'sxCount', name: '剩余数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'userName', name: '取样人', align: 'center' },
     { key: 'userName', name: '取样人', align: 'center' },
     { key: 'createTime', name: '创建试验时间', align: 'center' },

src/views/tentative/material/modules/testSample/tested.vue

@@ -66,8 +66,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="计算单位：">
-                            <el-input v-model="formModel.calculationUnit" placeholder="计算单位" disabled />
+                        <el-form-item label="试样单位：">
+                            <el-input v-model="formModel.calculationUnit" placeholder="试样单位" disabled />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -152,9 +152,10 @@ const tableColumn = ref([
     { key: 'materialName', name: '样品名称' },
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
-    { key: 'calculationUnit', name: '计算单位', align: 'center' },
+    { key: 'calculationUnit', name: '试样单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'userName', name: '取样人', align: 'center' },
     { key: 'ctestTime', name: '待测时间', align: 'center' },
     { key: 'action', name: '操作', width: 150, align: 'center' },

src/views/tentative/material/sampling.vue

@@ -115,45 +115,50 @@
                     <el-form-item label="试样数量">
                         <el-input v-model="addEditFormModel.materialCount" type="number" />
                     </el-form-item>
-                    <el-form-item label="是否外委">
-                        <el-radio-group v-model="addEditFormModel.isOutsourcing" size="large">
-                            <el-radio :value="1">是</el-radio>
-                            <el-radio :value="0">否</el-radio>
-                        </el-radio-group>
+                    <el-form-item label="试样单位">
+                        <el-input v-model="addEditFormModel.calculationUnit" />
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
                     <el-form-item label="代表数量">
                         <el-input v-model="addEditFormModel.representativeCount" type="number" />
                     </el-form-item>
+                    <el-form-item label="代表单位">
+                        <el-input v-model="addEditFormModel.representativeUnit" type="number" />
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="是否外委">
+                        <el-radio-group v-model="addEditFormModel.isOutsourcing" size="large">
+                            <el-radio :value="1">是</el-radio>
+                            <el-radio :value="0">否</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                     <el-form-item label="供应商">
                         <el-input v-model="addEditFormModel.supplierUnit" />
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="计算单位">
-                        <el-input v-model="addEditFormModel.calculationUnit" />
-                    </el-form-item>
                     <el-form-item label="生产批号">
                         <el-input v-model="addEditFormModel.batchNumber" />
                     </el-form-item>
-                </div>
-                <div class="hc-form-item">
                     <el-form-item label="取样人">
                         <el-select v-model="addEditFormModel.userId" block @change="changeusername">
                             <el-option v-for="item in userListData" :key="item.userId" :label="item.userName" :value="item.userId" />
                         </el-select>
                     </el-form-item>
+                </div>
+                <div class="hc-form-item">
                     <el-form-item label="拟用部位">
                         <el-input v-model="addEditFormModel.proposedPosition" />
                     </el-form-item>
+                    <el-form-item label="RFID编号">
+                        <el-input v-model="addEditFormModel.rfid" />
+                    </el-form-item>
                 </div>
                 <el-form-item label="样品描述">
                     <el-input v-model="addEditFormModel.sampleDescription" />
                 </el-form-item>
-                <el-form-item label="RFID编号">
-                    <el-input v-model="addEditFormModel.rfid" />
-                </el-form-item>
             </el-form>
             <template #leftRowFooter>
                 <hc-tooltip keys="tentative_material_sampling_links">
@@ -402,9 +407,10 @@ const tableColumn = ref([
     { key: 'specificationNumber', name: '样品编号' },
     { key: 'specificationModel', name: '规格型号' },
     { key: 'materialCount', name: '试样数量' },
-    { key: 'calculationUnit', name: '计算单位' },
+    { key: 'calculationUnit', name: '试样单位' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量' },
+    { key: 'representativeUnit', name: '代表单位' },
     { key: 'userName', name: '取样人' },
 ])