sale-client 3.5.21 → 3.5.24

package/src/filiale/kelai/sale.js

@@ -0,0 +1,6 @@
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) }
+}
+exports.specialComp = specialComp

package/src/filiale/macheng/FilesManageNew/UserEssentialInfoTest.vue

@@ -207,7 +207,7 @@
     </validator>
     <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
-        <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
+        <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo" :f_filialeid="f_filialeid"
                                  @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -233,7 +233,7 @@
 
   export default {
     title: '基本信息',
-    props: ['baseinfo', 'addressinfo', 'isedit'],
+    props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid'],
     data () {
       return {
         showselectaddress: false,

package/src/filiale/macheng/FilesManageNew/UserGeneralInfoTest.vue

@@ -8,7 +8,7 @@
           <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
         </div>
-        <file-user-essential-info-new :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
+        <file-user-essential-info-new :f_filialeid="f_filialeid" :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
                              @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
       </div>
 

package/src/filiale/shaoguan/handListMaintain.vue

@@ -14,7 +14,7 @@
                                :value.sync="model.f_startDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date >= '{}'"
+                               cond-value="h.f_input_date >= '{}'"
                                :show-reset-button="true"
                                class="select"
                   >
@@ -27,7 +27,7 @@
                                :value.sync="model.f_endDate"
                                :format="'yyyy-MM-dd HH:mm:ss'"
                                class="datepicker"
-                               condition="f_input_date <= '{}'"
+                               cond-value="h.f_input_date <= '{}'"
                                :show-reset-button="true"
                   >
                   </datepicker>
@@ -35,7 +35,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                         cond-value="h.f_userinfo_code = '{}'" placeholder='客户编号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户姓名</label>
@@ -60,7 +60,7 @@
                   <label class="font_normal_body" for="f_meter_classify">气表类型</label>
                   <v-select :options='$parent.$parent.meterType'
                             :value.sync="model.f_meter_classify"
-                            close-on-select condition="f_meter_classify = '{}'"
+                            close-on-select cond-value="h.f_meter_classify = '{}'"
                             placeholder='气表类型' value-single="true"
                             style="width: 60%"  v-model="model.f_meter_classify"></v-select>
                 </div>
@@ -69,7 +69,7 @@
                   <v-select :value.sync="model.f_gasbrand"
                             :options='$parent.$parent.getMeterBrands(model.f_meter_classify)'
                             placeholder='气表品牌' close-on-select
-                            condition="f_meter_brand = '{}'"
+                            cond-value="h.f_meter_brand = '{}'"
                             search v-model='model.f_gasbrand' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -111,7 +111,7 @@
                   <label class="font_normal_body">抄&ensp;表&ensp;员</label>
                   <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                             style="width:60%"
-                            condition="f_inputtor = '{}'"
+                            cond-value="h.f_inputtor = '{}'"
                             :options='$parent.$parent.inputtores' placeholder='抄表员'
                             close-on-select
                             v-el:cc></v-select>
@@ -139,7 +139,7 @@
                   <v-select :value.sync="model.f_hand_state"
                             :options='$parent.$parent.street'
                             placeholder='状态' close-on-select
-                            condition="f_hand_state = '{}'"
+                            cond-value="h.f_hand_state = '{}'"
                             search v-model='model.f_hand_state' v-ref:brand></v-select>
                 </div>
                 <div class="col-sm-2">
@@ -148,7 +148,7 @@
                             v-model="model.f_meter_state"
                             :value-single="true"
                             :options='$parent.$parent.meterstate'
-                            placeholder='抄表状态' condition="f_meter_state = '{}'"
+                            placeholder='抄表状态' cond-value="h.f_meter_state = '{}'"
                             close-on-select ></v-select>
                 </div>
                 <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
@@ -423,9 +423,9 @@ const myMap = new Map()
         if (!this.f_orgid) {
           this.f_orgid = this.$login.f.orgid
         }
-        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_orgid in ('" + this.f_orgid + "')"
-        args.condition = `${args.condition} ` + f_orgstr
-        this.model.search(args.condition, args.model)
+        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and h.f_orgid in ('" + this.f_orgid + "')"
+        args.condValueStr = `${args.condValueStr} ` + f_orgstr
+        this.model.search(args.condition, args.model, args.condValueStr)
         this.condition = args.condition
       },
       mergeRowData (joinrows) {

package/src/plugins/LogicService.js

@@ -329,9 +329,9 @@ let LogicService = {
     console.log('data提交之前', data)
     return Vue.resetpost('rs/logic/saveMeterBook', {data: data})
   },
-  gasPrice (model, row) {
-    console.log('气价保存，，', model)
+  gasPrice (model, row, blodid) {
     let data = {
+      f_blodid: blodid,
       f_price_type: model.f_price_type,
       f_price_name: model.f_price_name,
       f_user_type: model.f_user_type,