safecheck-client 4.0.1-12 → 4.0.1-14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.1-12",
+  "version": "4.0.1-14",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/jinhong/pc/CheckBookList.vue

@@ -23,7 +23,6 @@
                         :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
                         condition="tcb.id in {}"></v-select>
             </div>
             <!--            <div :class="$parent.$parent.style">-->
@@ -73,13 +72,12 @@
             </div>
 
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">安检册名</label>
+              <label class="font_normal_body">安检册名称</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
-                        :value-single="true" style="width: 60%"
+                        :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
-                        condition="tcb.id ='{}'"></v-select>
+                        condition="tcb.id in {}"></v-select>
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>

package/src/filiale/taiyuan/pc/DefectDeal.vue

@@ -217,7 +217,6 @@
             </td>
             <td style="text-align: center">
               <button style="margin-bottom: 5px" class="button_spacing button_search-1"  @click='$parent.$parent.$parent.showDealModal(row)'>{{row.f_is_repaired == '未处理' ? '处理' : '查看'}}</button>
-              <button style="margin-bottom: 5px" class="button_spacing button_search-1"  v-if="row.f_is_repaired == '未处理'" @click='$parent.$parent.$parent.delDefect(row)'>删除</button>
             </td>
           </template>
         </data-grid>
@@ -301,6 +300,17 @@
                 <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self-plus>
               </div>
             </div>
+            <div class="col-sm-12">
+              <div class="col-sm-6" v-if="solveModal.preData.repairedImg3">
+                <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg3" style="margin-left: 10px"></img-self-plus>
+              </div>
+              <div class="col-sm-6" v-if="solveModal.preData.repairedImg4">
+                <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg4"  style="margin-left: 10px"></img-self-plus>
+              </div>
+              <div class="col-sm-6" v-if="solveModal.preData.repairedImg5">
+                <img-self-plus :width="200" :height="200" :src="solveModal.preData.repairedImg5"  style="margin-left: 10px"></img-self-plus>
+              </div>
+            </div>
           </div>
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -508,6 +518,9 @@
             repairedImg: '',
             repairedImg1: '',
             repairedImg2: '',
+            repairedImg3: '',
+            repairedImg4: '',
+            repairedImg5: '',
             state: ''
           },
           uploadData: {
@@ -534,7 +547,7 @@
           if (res == 'confirm') {
             let http = new HttpResetClass()
             let updevices = `update t_devices_items set f_is_repaired ='已处理' where id = '${row.f_defect_id}'`
-             http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: updevices}},
+             http.load('POST', 'api/af-safecheck/logic/通用更新', {data: {sql: updevices}},
               {resolveMsg: null, rejectMsg: '删除安检册失败'})
             this.$refs.paged.$refs.criteria.search()
             this.$showMessage('删除成功')
@@ -633,6 +646,9 @@
         this.solveModal.preData.repairedImg = row.f_repair_path ? '/rs/image/file/' + row.f_repair_path : ''
         this.solveModal.preData.repairedImg1 = row.f_repair1_path ? '/rs/image/file/' + row.f_repair1_path : ''
         this.solveModal.preData.repairedImg2 = row.f_repair2_path ? '/rs/image/file/' + row.f_repair2_path : ''
+        this.solveModal.preData.repairedImg3 = row.f_repair_path ? '/resource/af-revenue/images/' + row.f_repair_path : ''
+        this.solveModal.preData.repairedImg4 = row.f_repair1_path ? '/resource/af-revenue/images/' + row.f_repair1_path : ''
+        this.solveModal.preData.repairedImg4 = row.f_repair2_path ? '/resource/af-revenue/images/' + row.f_repair2_path : ''
         this.solveModal.uploadData.id = row.f_defect_id
         this.solveModal.uploadData.f_repairman = row.f_repairman
         this.solveModal.uploadData.f_repair_date = row.f_repair_date

package/src/filiale/taiyuan/pc/checkUserList.vue

@@ -466,7 +466,7 @@ export default {
     //获取气价
     getPrice() {
       new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
-        {data: {items: "*", tablename: "t_stairprice", orderitem: "id", condition: `  f_state = '有效' and f_filialeid='${this.userlogin.orgid}'`}},
+        {data: {items: "*", tablename: "t_stairprice", orderitem: "id", condition: `  f_state = '有效' and f_filialeid='${this.userlogin.orgid}' and f_perform_date <= GETDATE() AND f_end_date >= GETDATE()`}},
         {resolveMsg: null, rejectMsg: null}).then((resp) => {
         resp.data.forEach((result) => {
           this.gasprice.push({label: result.f_price_name, value: result.f_price_id})