safecheck-client 4.0.1-60 → 4.0.1-62

package/src/components/pc/DefectMaterialLook.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">规格、型号</th>
+          <th class="textNoLineBreak">单价</th>
+          <th class="textNoLineBreak">数量</th>
+          <th class="textNoLineBreak">金额</th>
+          <th class="textNoLineBreak">操作人</th>
+          <th class="textNoLineBreak">操作时间</th>
+          <th class="textNoLineBreak">备注</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_typenumber}}</nobr>
+          </td>
+
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_fee}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_remarks}}</nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  name: '隐患明细材料查看',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data () {
+    return {
+      onetomany: {
+        rows: []
+      }
+    }
+  },
+  ready(){
+    this.getOnetoManyData()
+  },
+  methods: {
+    /*获取工单收费添加的材料*/
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        items: '*',
+        tablename: 't_material_service',
+        condition: `f_process_id = '${this.selectdata.f_defect_id}'`,
+        orderitem: 'id'
+      }
+      http.load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '获取数据失败'
+      }).then(res => {
+        this.onetomany.rows = res.data
+      })
+    }
+  },
+  events: {
+  },
+}
+
+</script>
+
+<style scoped>
+
+</style>

package/src/components/pc/PaperDefectMain.vue

@@ -258,6 +258,9 @@
               <th>
                 <nobr>接收人</nobr>
               </th>
+              <th v-if="$parent.$parent.$parent.canlook">
+                <nobr>材料明细</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -279,6 +282,9 @@
             <td style="text-align: center">{{row.f_service_id}}</td>
             <td style="text-align: center">{{row.f_handlingtype}}</td>
             <td style="text-align: center">{{row.f_order_man}}</td>
+            <td class="flex-around" v-if="$parent.$parent.$parent.canlook">
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.lookMateril(row)">查看材料</button>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -366,6 +372,16 @@
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
       </modal>
+      <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+        <header slot="modal-header" class="modal-header text-center">
+          <button type="button" class="close" @click="close2"><span>&times;</span></button>
+          <h4 class="modal-title">材料查看</h4>
+        </header>
+        <article slot="modal-body">
+          <defect-material-look v-if="showmaterial"  :selectdata = "selectdata" ></defect-material-look>
+        </article>
+        <footer slot="modal-footer"></footer>
+      </modal>
     </div>
   </div>
 </template>
@@ -423,7 +439,8 @@
       model.f_filialeid = `('${this.$login.f.orgid}')`
       return {
         audioshow:false,
-
+        showmaterial: false,
+        selectdata: {},
         model: model,
         deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'}],
         repairStateOptions: this.getSafeParam('隐患状态'),
@@ -477,6 +494,7 @@
         showModal3: false,
         progressbarWidth:'0',
         canToRepair: this.$appdata.getSingleValue('隐患明细转维修'),
+        canlook: this.$appdata.getSingleValue('隐患明细查看材料')?true:false,
         checkes: []
       }
     },
@@ -486,6 +504,13 @@
       }
     },
     methods: {
+      lookMateril(row){
+        this.selectdata=row
+        this.showmaterial=true
+      },
+      close2(){
+        this.showmaterial=false
+      },
       delConfigKey(obj){
         // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
         Object.keys(obj).forEach(key =>{

package/src/filiale/qingjian/android/PhoneUpUserinfo.vue

@@ -257,10 +257,6 @@
           <label class="righttxt">气表类型:</label>
           <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
         </div>
-        <div class="row auto" style="margin: 5px 0">
-          <label class="righttxt">现场表具型号:</label>
-          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_xc_meter_style"/>
-        </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">表前阀状态:</label>
           <!--<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_position"  readonly/>-->
@@ -665,7 +661,6 @@ export default {
           this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           this.userinfo_old.meterinfo[0].f_meternumber = this.userinfo.meterinfo[0].f_meternumber
-          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
@@ -748,7 +743,6 @@ export default {
           this.userinfo_old.meterinfo[0].f_bqf_state = this.userinfo.meterinfo[0].f_bqf_state
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           this.userinfo_old.meterinfo[0].f_meternumber = this.userinfo.meterinfo[0].f_meternumber
-          this.userinfo_old.meterinfo[0].f_xc_meter_style = this.userinfo.meterinfo[0].f_xc_meter_style
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model
           userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])