sale-client 3.6.230 → 3.6.232

package/package.json

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

package/src/components/revenue/comprehen/gasbrand/AddGasMeterInitParam.vue

@@ -32,7 +32,8 @@
                       :multiple="param.multiple ? param.multiple : false"
                       v-model="row[param.title]"
                       :options='param.params'
-                      :close-on-select="param.multiple ? param.multiple == true ? false : true :true"
+                      :value-single="param.multiple ? param.multiple == 'true' ? false : true : true"
+                      :close-on-select="param.multiple ? param.multiple == 'true' ? false : true :true"
                     >
                     </v-select>
                   </div>
@@ -135,14 +136,14 @@ export default {
         this.$showMessage(`${yzStr}表单项格式错误，请悬浮到表单标签右侧的图标，按照悬浮文字提供的格式来填写表单项！！！`, ['confirm'])
         return
       }
-      let meterInitParam = JSON.stringify(this.row, function (key, value) {
-        if (Array.isArray(value) && value.length === 1) {
-          // 对于长度为1的数组，转换为字符串
-          return value[0].toString()
-        }
-        return value
-      })
-      this.$dispatch('init-param-confirm', meterInitParam)
+      // let meterInitParam = JSON.stringify(this.row, function (key, value) {
+      //   if (Array.isArray(value) && value.length === 1) {
+      //     // 对于长度为1的数组，转换为字符串
+      //     return value[0].toString()
+      //   }
+      //   return value
+      // })
+      this.$dispatch('init-param-confirm', JSON.stringify(this.row))
     },
     cancel () {
       this.$dispatch('init-param-cancel')

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

@@ -432,6 +432,9 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>备注</nobr>
+                </th>
                 <th><nobr>附件</nobr></th>
               </tr>
             </template>
@@ -586,6 +589,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
               <td style="text-align: center;"><nobr>
                 <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
                 <button v-if="row.f_notified_path" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.imgShow(row.f_notified_path)">图像识别</button>
@@ -829,7 +835,8 @@
           'f_paper_account': '开户行及账号',
           'f_bank_name': '银行名称',
           'f_oughtfee': '欠费金额',
-          'f_balance': '上期余额'},
+          'f_balance': '上期余额',
+          'f_comments': '备注'},
         batchmoneyShow: false,
         prices: [],
         bgl: [{label: '全部', value: ''}, {label: '有', value: '1'}, {label: '无', value: '0'}],

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

@@ -523,7 +523,7 @@
         orgCondtionStr: '',
         priceSplit: false,
         criteriaShow: false,
-        model: new PagedList('rs/sql/getDownPlan', 30, {orderitem: this.orderDefault ? '"' + this.orderDefault + ' "' : `'f_userinfo_code desc'`}),
+        model: new PagedList('rs/sql/getDownPlan', 30, {orderitem: this.orderDefault ? '"' + this.orderDefault + ' "' : `'f_userinfo_id desc'`}),
         config: {
 
           // 导出列要和查询列相同
@@ -584,7 +584,7 @@
         msg: '',
         condition: '',
         headers: {'username': Vue.$login.f.name, 'blodid': Vue.$login.guid()},
-        orderDefault: 'f_userinfo_code',
+        orderDefault: 'f_userinfo_id',
         orderFields: {
           f_userinfo_id: 'no'
         },

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

@@ -354,6 +354,9 @@
               <th>
                 <nobr>下发人员</nobr>
               </th>
+              <th>
+                <nobr>备注</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -454,6 +457,7 @@
             <td>{{row.f_inputtor}}</td>
             <td>{{row.f_input_person}}</td>
             <td>{{row.f_operator}}</td>
+            <td>{{row.f_comments}}</td>
             <td style="text-align: center;"><nobr>
               <!-- 已抄表，还没审核-->
               <button type="button" name="button" class="button_search button_spacing width-60"
@@ -851,7 +855,8 @@
             'f_meter_style': '气表型号',
             'f_accounts_state': '下账标识',
             'f_user_phone': '客户电话',
-            'f_adjustable_id': '表箱号'
+            'f_adjustable_id': '表箱号',
+            'f_comments': '备注'
           },
           examine: true,
           customCal: false

package/src/filiale/lixianV3/ChangeMeter.vue

@@ -259,6 +259,13 @@
                     close-on-select
                     v-model='model.f_newaroundmeter'></v-select>
         </div>
+        <div  class="col-sm-4 form-group" :class="[$v.f_newaroundmeter.required ? 'has-error' : '']">
+          <label  class="font_normal_body">换表原因</label>
+          <v-select :value.sync="model.f_changetables_reason" :options='changetablesreason' placeholder='换表原因'
+                    :value-single="true"
+                    close-on-select
+                    v-model='model.f_changetables_reason'></v-select>
+        </div>
         <div class="row auto">
           <div class="col-sm-12"
                v-if="!commitflag"
@@ -276,10 +283,6 @@
             ></textarea>
           </div>
         </div>
-        <div class="col-sm-12" >
-          <label class="font_normal_body ">换表原因</label>
-          <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_changetables_reason"></textarea>
-        </div>
         <div style="text-align:right;height:auto;">
           <button class="button_search" v-show="config.approve == true ? applyButtonShow : false" type="button" @click="apply()"
                   :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid"
@@ -525,6 +528,9 @@ export default {
     aroundmeters () {
       return this.$appdata.getParam('左右表')
     },
+    changetablesreason () {
+      return this.$appdata.getParam('换表原因')
+    },
     flowmeterbrands () {
       let gasbrand = this.$GetSaleParam.getGasbrand()
       let flowmeterbrands = []

package/src/filiale/qianneng/charge/ChargeList.vue

@@ -17,7 +17,7 @@
           <div class="form-group col-sm-3">
             <label class="font_normal_body">客户名称</label>
             <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_name" placeholder='客户名称'
-                   @keyup.enter="$parent.$parent.clean()" >
+                   @keyup.enter="$parent.$parent.clean()" condition="f_user_name like '%{}%'">
           </div>
           <!--<div class="row" >-->
           <div  v-show="$parent.$parent.criteriaShow">
@@ -597,7 +597,7 @@
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
         showCardError2: false,
-        model: new PagedList('rs/sql/sale_getUser', 30, {f_user_name: 'this.model.f_user_name', orderitem: '"' + this.orderitem + ' DESC"'}),
+        model: new PagedList('rs/sql/sale_getUser', 30, { orderitem: '"' + this.orderitem + ' DESC"'}),
         isPager: true,
         rows: null,
         cardInfo: '',
@@ -750,6 +750,11 @@
         if (this.f_orgid) {
           args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
         }
+        if (this.$refs.paged.$refs.cri.model.f_user_name && this.$refs.paged.$refs.cri.model.f_user_name.length > 0) {
+          this.model.params.f_user_name = this.$refs.paged.$refs.cri.model.f_user_name
+        } else {
+          this.model.params.f_user_name = ''
+        }
         this.excelCondition = args.condition
         args.condition = `${args.condition}`
         if (this.defbtn === '发卡售气') {

package/src/filiale/yuncheng/machineHandAudit.vue

@@ -308,6 +308,9 @@
               <th>
                 <nobr>抄表员</nobr>
               </th>
+              <th>
+                <nobr>备注</nobr>
+              </th>
               <th><nobr>附件</nobr></th>
               <!--              <th><nobr>附件</nobr></th>-->
               <!--            f_oughtfee-->
@@ -361,6 +364,7 @@
             <td> <nobr>{{row.f_meter_book_sort}} </nobr></td>
             <td>{{row.f_adjustable_name}}</td>
             <td>{{row.f_inputtor}}</td>
+            <td>{{row.f_comments}}</td>
             <td style="text-align: center;"><nobr>
               <img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="50" :height="50"></img-self>
 
@@ -465,7 +469,8 @@
           'f_book_name': '抄表册',
           'f_meter_book_sort': '表册顺序',
           'f_adjustable_name': '调压箱名称',
-          'f_inputtor': '抄表员'
+          'f_inputtor': '抄表员',
+          'f_comments': '备注'
         },
         auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
         auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],