业务流程优化

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmBgJiaofu.vue

@@ -5,11 +5,19 @@
       <tr>
         <td class="title" style="width: 100px">试验完成时间</td>
         <td class="content" style="width: 360px">
-          <div style="width: 440px"></div>
+          <!-- <div style="width: 440px"></div> -->
+          <input v-model="tableData.wanChengTime" style="text-align: center" />
         </td>
         <td class="title white" style="width: 100px">添加归档材料</td>
         <td class="content" style="width: 450px">
-          <input v-model="tableData.shuruLeixing" style="text-align: center" />
+          <j-upload v-model="fileList" text="上传"></j-upload>
+          <!-- <input id="excel" type="file" name="excel"
+            @change="getFilePath"
+          /> -->
+          <!-- <div class="import-content">
+            <el-button @click="daoruButton">点击进行导入明细表</el-button>
+            <div class="excel">{{ excel }}</div>
+          </div> -->
         </td>
       </tr>
       <tr>
@@ -58,6 +66,7 @@
 </template>
 
 <script>
+import JUpload from '@/components/jeecg/JUpload'
 export default {
     name: 'itdmBgJiaofu',
     data() {
@@ -68,9 +77,25 @@ export default {
                   total: 0,
                 },
               ],
+              // 完成时间
+              wanChengTime: '',
             },
+            // 导入文档
+            fileList:[],
+            // 导入excel
+            excel: '',
         }
     },
+    methods: {
+      // 点击导入excel
+      daoruButton() {
+        document.getElementById('excel').click()
+      },
+      getFilePath(e) {
+        this.excel = document.getElementById('excel').files[0].name
+        console.log(this.excel)
+      },
+    }
 }
 </script>
 

itdmWeb/src/views/module-iTDM/itdmYeWu/itdmXqPingshen.vue

@@ -3,7 +3,7 @@
     <div class="head">第二部分　试验需求评审</div>
     <table class="main-table">
       <tr>
-        <td class="title" style="width: 100px">技术线</td>
+        <td class="title" style="width: 100px;">技术线</td>
         <td class="content" style="width: 440px;">
           <div>
             <el-checkbox-group v-model="tableData.checkList">
@@ -24,8 +24,8 @@
             </el-checkbox-group>
           </div>
         </td>
-        <td class="title white" style="width: 100px">产品线</td>
-        <td class="content" style="width: 440px">
+        <td class="title white" style="width: 100px;">产品线</td>
+        <td class="content" style="width: 440px;">
           <el-checkbox-group v-model="tableData.checkList2">
             <div class="jishuxian" style="justify-content: center;">
               <el-checkbox label="检测试验"></el-checkbox>
@@ -35,22 +35,22 @@
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">试验分级</td>
-        <td class="content" style="width: 440px">
+        <td class="title" style="width: 100px;">试验分级</td>
+        <td class="content" style="width: 440px;">
           <div style="display: flex;justify-content: center;color: red;align-items:center;">重要性系数：
             <input v-model="tableData.factor"/>
           </div>
         </td>
         <td class="title white" style="width: 100px">重要性标准</td>
         <td class="content" style="width: 450px">
-          <div class="jishuxian" style="justify-content: center;">气候试验：0.40　　力学试验：0.70　　力学/气候：0.55</div>
-          <div class="jishuxian" style="justify-content: center;">重要试验：1.00　　非标试验：1.00</div>
+          <div class="jishuxian" style="justify-content: center;">气候试验：0.40　　力学试验：0.70　　重要/非标试验：1.00</div>
+          <!-- <div class="jishuxian" style="justify-content: center;">重要试验：1.00　　非标试验：1.00</div> -->
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">试验等级</td>
-        <td class="content" style="width: 360px">
-          <div style="display: flex; align-items: flex-end">
+        <td class="title" style="width: 100px;">试验等级</td>
+        <td class="content" style="width: 360px;">
+          <div style="display: flex; align-items: flex-end;">
             <table>
               <tr>
                 <td>序号</td>
@@ -70,15 +70,15 @@
             <div class="addRow" style="margin-right:1.1%" @click="addRow">添加</div>
           </div>
         </td>
-        <td class="title white" style="width: 100px">备注</td>
-        <td class="content" style="width: 450px">
+        <td class="title white" style="width: 100px;">备注</td>
+        <td class="content" style="width: 450px;">
           <input v-model="tableData.shuruLeixing" style="text-align: center" />
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">三外需求</td>
-        <td class="content" style="width: 360px" colspan="3">
-          <div style="display: flex; align-items: flex-end">
+        <td class="title" style="width: 100px;">三外需求</td>
+        <td class="content" style="width: 360px;" colspan="3">
+          <div style="display: flex; align-items: flex-end;">
             <table>
               <tr>
                 <td>序号</td>
@@ -104,28 +104,30 @@
                 <td style="font-weight: bold;">{{ totalCleanPrice }}</td>
               </tr>
             </table>
-            <div class="addRow" style="margin-right:1.1%" @click="addRow2">添加</div>
+            <div class="addRow" @click="addRow2">添加</div>
+            <div class="btn" style="margin-right:1.1%" @click="addSubTable">提交</div>
           </div>
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px">评审结论</td>
-        <td class="content" style="width: 360px">
+        <td class="title" style="width: 100px;">评审结论</td>
+        <td class="content" style="width: 360px;">
           <el-radio-group v-model="tableData.radio">
             <el-radio :label="1">可以满足</el-radio>
             <el-radio :label="2">部分满足</el-radio>
             <el-radio :label="3">不能满足</el-radio>
           </el-radio-group>
         </td>
-        <td class="title white" style="width: 100px">主审人</td>
-        <td class="content" style="width: 450px">
+        <td class="title white" style="width: 100px;">主审人</td>
+        <td class="content" style="width: 450px;">
           <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
       <tr>
-        <td class="title" style="width: 100px" colspan="2">项目流转</td>
-        <td class="title white" style="width: 100px">工程技术部部长</td>
-        <td class="content" style="width: 450px">
+        <td class="title" style="width: 100px;" colspan="2">项目流转</td>
+        <td class="title white" style="width: 100px;">工程技术部部长</td>
+        <td class="content" style="width: 450px;" >
+          <div class="btn" style="position: absolute;right: 3%;" @click="addSubTable">提交</div>
           <!-- <input v-model="tableData.shuruLeixing" style="text-align: center" /> -->
         </td>
       </tr>
@@ -187,6 +189,10 @@ export default {
       delRow2(index) {
         this.tableData.demandSanwai.splice(index, 1)
       },
+      addSubTable() {
+        console.log(this.tableData.cleanPrice)
+        console.log(this.tableData)
+      },
     }
 }
 </script>
@@ -227,15 +233,16 @@ tr {
   cursor: pointer;
 }
 .btn {
-  display: inline-block;
+  /* display: inline-block; */
+  width: 60px;
+  height: 24px;
   padding: 2px 10px;
   font-size: 13px;
   border: 1px solid rgb(3, 188, 244);
   color: rgb(8, 187, 241);
   border-radius: 4px;
   cursor: pointer;
-  position: absolute;
-  right: 3%;
+  margin-left: 20px;
 }
 .delBtn {
   padding: 3px 10px;