sale-client 4.0.70-preview → 4.0.72-preview

package/build/dev-server.js

@@ -20,10 +20,10 @@ var devConfig = {
     },
     proxy: {
       '/api/af-revenue/logic': {
-        // pathRewrite: {
-        //   '/api/af-revenue/logic': '/logic'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl
       },
       '/api/af-revenue/file': {
         // pathRewrite: {
@@ -32,10 +32,10 @@ var devConfig = {
         target: serverRul
       },
       '/api/af-revenue/sql': {
-        // pathRewrite: {
-        //   '/api/af-revenue/sql': '/sql'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl
       },
       '/api': {
         target: serverRul

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.0.70-preview",
+  "version": "4.0.72-preview",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -95,6 +95,12 @@
         <saletab header="用户重点记录" v-if="permission('用户重点记录')">
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
+        <saletab header="维修记录" v-if="permission('维修记录')">
+          <repair-list :row="row"  @deal-msg="dealMsg"></repair-list>
+        </saletab>
+        <saletab header="安检记录" v-if="permission('安检记录')">
+          <security-check-info :row="row"  @deal-msg="dealMsg"></security-check-info>
+        </saletab>
 <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
 <!--          <supervisory-control :row="row"  ></supervisory-control>-->
 <!--        </saletab>-->
@@ -127,6 +133,8 @@
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
   import contractSigningList from './ic_detail/contractSigningList'
   import UserKeyRecord from './ic_detail/UserKeyRecord'
+  import RepairList from "./ic_detail/RepairList";
+  import SecurityCheckInfo from './ic_detail/SecuritycheckInfo';
   // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
   // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
   // 导入物联网相关查询
@@ -144,6 +152,8 @@ export default {
     title: '用户详细信息',
     props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
     components: {
+      SecurityCheckInfo,
+      RepairList,
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
       AutomaticPurse,

package/src/components/common/userinfo_detail/ic_detail/RepairList.vue

@@ -0,0 +1,109 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+<!--            <th><nobr>操作</nobr></th>-->
+            <th><nobr>工单状态</nobr></th>
+            <th><nobr>工单类型</nobr></th>
+            <th><nobr>是否完成</nobr></th>
+            <th><nobr>工单编号</nobr></th>
+            <th><nobr>报修时间</nobr></th>
+            <th><nobr>报修电话</nobr></th>
+            <th><nobr>报修内容</nobr></th>
+            <th><nobr>用户地址</nobr></th>
+            <th><nobr>派单人员</nobr></th>
+            <th><nobr>维修人员</nobr></th>
+            <th><nobr>完成时间</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+<!--          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>-->
+<!--            <button class="button_search button_spacing" style="margin-right: 9px"-->
+<!--                    @click="$parent.$parent.$parent.showDetail(row)">详情-->
+<!--            </button>-->
+<!--          </nobr></td>-->
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr> {{ row.f_state ?row.f_state:(row.defname ?row.defname:'完成')}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_workorder_type}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_result_status?row.f_result_status:'未完成'}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_service_id}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_created_date}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_phone}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_address}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_single_man}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_order_man}}</nobr></td>
+
+          <!--<td :style="row.f_result_status=='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>-->
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_date_leave}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '历史维修记录',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/serviceDetails', 5),
+        row: Object,
+        show: false
+      }
+    },
+
+    props: {
+      user: {
+        type: Object
+      },
+      callObj: {
+        type: Object
+      },
+      clearflg: 0,
+      row: {
+        type: Object
+      }
+    },
+    methods: {
+      showDetail (row) {
+        console.log('996', row)
+        this.row = row
+        this.show = true
+      },
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        this.model.rows = []
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      },
+      'clearflg' () {
+        this.model.rows = []
+      }
+    },
+    ready () {
+      console.log('看看row的信息', this.row)
+      if (this.row.f_userinfo_id) {
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      }
+    }
+  }
+</script>

package/src/components/common/userinfo_detail/ic_detail/SecuritycheckInfo.vue

@@ -0,0 +1,155 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+<!--            <th><nobr>卡号</nobr></th>-->
+            <th><nobr>安检日期</nobr></th>
+            <th><nobr>入户情况</nobr></th>
+            <th><nobr>安检员</nobr></th>
+            <th> <nobr>隐患明细</nobr></th>
+<!--            <th> <nobr>操作</nobr></th>-->
+          </tr>
+        </template>
+        <template partial='body'>
+<!--          <td><nobr>{{row.f_card_id}}</nobr></td>-->
+          <td style="text-align: center"><nobr>{{row.f_onsite_time.substring(0,11)}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_entry_status}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_checker_name}}</nobr></td>
+     <td style="text-align: center" ><nobr>{{row.f_defect_text?row.f_defect_text:$parent.$parent.$parent.getjsonData(row.f_defect_content)}}</nobr></td>
+<!--          <td style="text-align: center"><nobr><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.change(row)">查看</button-link></nobr></td>-->
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+<!--  <modal :show.sync="infoshow" large="true" v-ref:modal backdrop="false" width="1200">-->
+<!--    <header slot="modal-header" class="modal-header">-->
+<!--      安检详情-->
+<!--    </header>-->
+<!--    <article slot="modal-body" class="modal-body">-->
+<!--      <div class="from-group col-smm-12 col-md-12 col-xs-12" v-if="infoshow">-->
+<!--        <new-check-paper :f_plan_id="onedata.f_check_plan_id" :item="onedata" role="view" >-->
+<!--        </new-check-paper>-->
+<!--      </div>-->
+<!--    </article>-->
+<!--    <footer slot="modal-footer" class="modal-footer">-->
+<!--      <button type="button" class="btn btn-success" @click='close'>确认</button>-->
+<!--    </footer>-->
+<!--  </modal>-->
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import { isEmpty } from "../../../../Util"
+  // import newCheckPaper from "./NewCheckpaper.vue"
+  // 获取json配置文件
+  let asyncReady = async function (self) {
+    // 获取配置信息
+    try {
+      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+      Vue.config = res.data
+    } catch (error) {
+      // 忽略704,文件找不到异常R
+      if (error.status !== 704) {
+        throw error
+      }
+    }
+  }
+
+  export default {
+    // components: {
+    //   newCheckPaper
+    // },
+    title: '用户安检历史',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/查找安检单', 5, {orderitem: '"f_onsite_time desc"',f_plan_id:'""',f_approved:'""',f_entry_status:'""',f_no_checkplan:'""',f_filialeid:'""'}),
+        row: Object,
+        infoshow: false,
+        onedata: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg: 0,
+      row: {
+        type: Object
+      }
+    },
+    methods: {
+      close () {
+        this.infoshow = false
+      },
+      change (row) {
+        // Vue.$login = {jwt: row.f_checker_id}
+        asyncReady(this).then(() => {
+          row.f_upload_state = '已传'
+          this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+        }).catch(
+          (respanse) => {
+            alert ('获取配置文件失败')
+          })
+      },
+      // change(val){
+      //
+      //   this.onedata = val
+      //   this.infoshow = true
+      // },
+      getjsonData (value) {
+        // 将value字符串转换成json对象
+        let jsonStr = JSON.parse(value)
+        let str = jsonStr.data
+        if (jsonStr.result === '正常') {
+          return '正常'
+        } else {
+          let result = ''
+          if (str) {
+            for (const itemdata of str) {
+              const keys = Object.keys(itemdata)
+              for (const itm of keys) {
+                const value = itemdata[itm]
+                result += itm + ':' + value + ' '
+              }
+            }
+          }
+          return result
+        }
+      },
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        // tag
+        this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
+      },
+      'clearflg' () {
+        this.model.rows = []
+      }
+    },
+    ready () {
+      console.log('看看row的信息', this.row)
+      if (this.row.f_userinfo_id) {
+        this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
+      }
+      // this.model.rows=[{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'}]
+    }
+  }
+</script>

package/src/components/revenue/machineHandManage/HandplanQuery.vue

@@ -281,6 +281,15 @@
                               condition="f_sellinggas_operate_date <= '{}'">
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">有无附件</label>
+                  <v-select v-model="model.f_notified_path"
+                            :value.sync="model.f_notified_path"
+                            :options="$parent.$parent.attachmentOptions"
+                            placeholder="请选择"
+                            condition="{}"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -728,6 +737,10 @@
     title: '机表抄表查询',
     data () {
       return {
+        attachmentOptions: [
+          { label: '是', value: 'f_notified_path is not null' },
+          { label: '否', value: 'f_notified_path is null' }
+        ],
         iswork: false,
         other: [],
         footer: [],

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/beifangshiye/sale'
+import FilialeSale from './filiale/ronghao/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/plugins/ChangeMeterService.js

@@ -638,6 +638,7 @@ let ChangeMeterService = {
       f_voucher_number: model.f_voucher_number,
       f_price_name: row.f_price_name,
       f_price_id: row.f_price_id,
+      f_is_liability: model.f_is_liability,
       f_stairprice_id: row.f_stairprice_id,
       f_user_id: row.f_user_id,
       f_user_name: row.f_user_name,