代码同步

src/views/batchRecord/components/editModal.vue

@@ -271,7 +271,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="检查工具">
+            <el-table-column v-if="form.recordRulesClassify != '4'" label="检查工具">
               <template slot-scope="{ row }">
                 <el-link :underline="false" style="cursor: pointer">
                   <div class="ele-cell">
@@ -289,15 +289,7 @@
               </template>
             </el-table-column>
 
-            <!-- <el-table-column label="检查工具">
-              <template slot-scope="scope">
-                <div>
-                  {{ scope.row.tools.map((i) => i.toolName).join(',') || '无' }}
-                </div>
-              </template>
-            </el-table-column> -->
-
-            <el-table-column label="检查人">
+            <el-table-column v-if="form.recordRulesClassify != '4'" label="检查人">
               <template slot-scope="scope">
                 <div
                   @click="openSelectUser(scope.row)"
@@ -308,7 +300,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="检查情况">
+            <el-table-column v-if="form.recordRulesClassify != '4'" label="检查情况">
               <template slot-scope="scope">
                 <div>
                   <el-radio-group v-model="scope.row.checkStatus">
@@ -334,7 +326,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="检查结果">
+            <el-table-column v-if="form.recordRulesClassify != '4'" label="检查结果">
               <template slot-scope="scope">
                 <div>
                   <el-radio-group v-model="scope.row.checkResult">

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -189,6 +189,19 @@
       </el-row>
     </el-form>
 
+    <header-title title="物料清单"></header-title>
+
+    <ele-pro-table
+      ref="table"
+      row-key="id"
+      :columns="materialColumns"
+      :datasource="[]"
+      cache-key="prenatal-examination-material-list-table-2510231107"
+      autoAmendPage
+      :needPage="false"
+    >
+    </ele-pro-table>
+
     <header-title title="检查项目"></header-title>
 
     <!-- 表格 -->
@@ -543,7 +556,16 @@
         return this.teamUserList.filter((user) =>
           this.addForm.executeUsersIds.includes(user.id)
         );
-      }
+      },
+      // 物料清单表头
+      materialColumns: [
+        {
+          width: 45,
+          type: 'index',
+          columnKey: 'index',
+          align: 'center'
+        }
+      ]
     },
     mounted() {
       if (localStorage.getItem('singleUserInfo') == '1') {

vue.config.js

@@ -33,13 +33,11 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.116:18086', // 赵沙金
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',