Merge branch 'AIControlV1.3.0' into test

src/components/recordInput/AddRecordItem.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="addRecordItemWrapper">
-        <crumbs :title="title" :param="$route.params" linkTo="RecordItemList"></crumbs>
+        <crumbs :title="title" :param="$route.params"  minWidth="1120px" linkTo="RecordItemList"></crumbs>
         <div class="contents">
             <div class="content">
                 <el-form :rules="rules" ref="form" :label-position="labelPosition" label-width="125px" class="add-record-form" :model="form">
@@ -101,6 +101,15 @@
                                    <el-checkbox v-model="scope.row.isUsed" :checked="scope.row.isUsed=='1'" :disabled="getIsUsed(scope.row)" true-label="1" false-label="0"></el-checkbox>
                                 </template>
                             </el-table-column>
+                            <el-table-column
+                              prop="address"
+                              label="单项否决"
+                              width="120"
+                              show-overflow-tooltip>
+                               <template slot-scope="scope">
+                                   <el-checkbox v-model="scope.row.isReject" :checked="scope.row.isReject=='1'" :disabled="getIsUsed(scope.row)" true-label="1" false-label="0"></el-checkbox>
+                                </template>
+                            </el-table-column>
                           </el-table>
                       </div>
                          
@@ -220,7 +229,8 @@
                 hospitalName:  this.hospitalList[i].name,
                 value: '',
                 tipMsg:'',
-                isUsed: '0'
+                isUsed: '0',
+                isReject:'0'
               })
             }
             for(let i = 0; i < this.selectHospital.length; i++){
@@ -230,6 +240,7 @@
                   item.value = selectItem.score
                   item.tipMsg = selectItem.msg
                   item.isUsed = selectItem.isUsed
+                  item.isReject = selectItem.isReject
                   this.multipleSelection.push(item)
               }
             
@@ -341,7 +352,8 @@
               modifier:this.modifier,
               hospitalId: item.hospitalId,
               msg: item.tipMsg,
-              isUsed: item.isUsed
+              isUsed: item.isUsed,
+              isReject: item.isReject,
             })
           }
            let params = {
@@ -442,7 +454,7 @@
             background: #fff;
             padding: 20px 20px 50px;
             color: #545455;
-            min-width: 980px;
+            min-width: 1100px;
             position: relative;
             .short-inp{
                 width: 200px;

src/components/recordInput/ManageItemBatch.vue

@@ -113,6 +113,16 @@
                                         <!-- <el-checkbox v-model="scope.row.isUsed" :value ="scope.row.isUsed" :disabled="getIsUsed(scope.row)" true-label="1" false-label="0">{{scope.row.isUsed}}</el-checkbox> -->
                                       </template>
                                   </el-table-column>
+                                  <el-table-column
+                                    prop="address"
+                                    label="单项否决"
+                                    width="120"
+                                    show-overflow-tooltip>
+                                    <template slot-scope="scope">
+                                        <span class="checkUsed" :class="{'active': scope.row.isReject == 1,'disabled': getDisabled(scope.row,item.remark)}" @click="checkReject(scope.row,index,scope.$index,item.remark)"></span>
+                                        <!-- <el-checkbox v-model="scope.row.isUsed" :value ="scope.row.isUsed" :disabled="getIsUsed(scope.row)" true-label="1" false-label="0">{{scope.row.isUsed}}</el-checkbox> -->
+                                      </template>
+                                  </el-table-column>
                                   </el-table>
                                 </el-collapse-item>
                               </el-collapse>
@@ -216,6 +226,21 @@
         const values = Object.values(this.checkAllMap)
         this.toggleSelection(values)
       },
+      checkReject(row,index,ii,remark){
+        if(this.getDisabled(row,remark)){
+          return
+        }
+        let isReject = this.caseLIst[index].qcCasesEntry[ii].isReject
+        const caseLIstCopy = JSON.parse(JSON.stringify(this.caseLIst))
+        if(isReject == 1){
+          caseLIstCopy[index].qcCasesEntry[ii].isReject = 0
+        }else{
+          caseLIstCopy[index].qcCasesEntry[ii].isReject = 1
+        }
+        this.caseLIst = caseLIstCopy
+        const values = Object.values(this.checkAllMap)
+        this.toggleSelection(values)
+      },
       handleSelectionChange(val,remark) {
         this.checkAllMap[remark] = val;
       },
@@ -248,6 +273,7 @@
             for(let i = 0; i < caseLIstCopy.length; i++){
               for(let j = 0; j < caseLIstCopy[i].qcCasesEntry.length; j++){
                 caseLIstCopy[i].qcCasesEntry[j].isUsed = 0
+                caseLIstCopy[i].qcCasesEntry[j].isReject = 0
               }
             }
 
@@ -309,6 +335,7 @@
                 recordItem.score = checkedItem.score
                 recordItem.msg = checkedItem.msg
                 recordItem.isUsed = checkedItem.isUsed
+                 recordItem.isReject = checkedItem.isReject
                 recordItem.modeName = checkedItem.modeName
                 this.checkAllMap[caseItem.remark].push(recordItem)
               }
@@ -364,7 +391,8 @@
               "msg": value.msg||"",
               "remark": value.remark,
               "score": Number(value.score),
-              "isUsed":value.isUsed||0
+              "isUsed":value.isUsed||0,
+              "isReject":value.isReject||0
             }
             casesEntryHospitals.push(item)
           }
@@ -490,7 +518,7 @@
         background: #fff;
         padding: 20px 20px 50px;
         color: #545455;
-        min-width: 1200px;
+        min-width: 1300px;
         position: relative;
         .short-inp{
             width: 200px;

vue.config.js

@@ -1,7 +1,7 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
-// const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:88';
+const proxy_path = 'http://192.168.2.241:88';
+// const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
 // const proxy_path = 'http://192.168.3.113:5050'; //王峰