manage-client 3.3.120 → 3.3.121-cs

package/src/components/sale/businessquery/FMYGasQuery.vue

@@ -137,10 +137,12 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="f_gasproperties = '{}'"
-                            close-on-select></v-select>
+                            :multiple="true"
+                            condition="f_gasproperties in {}">
+                  </v-select>
                 </div>
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
@@ -175,12 +177,12 @@
                          condition="f_oughtamount <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startHandDate" class="font_normal_body">开户时间</label>
+                  <label for="startHandDate" class="font_normal_body">通气时间</label>
                   <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startOpenDate"
-                              :value.sync="model.startOpenDate"
+                              v-model="model.startGasDate"
+                              :value.sync="model.startGasDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_open_date >= '{}'"
+                              condition="f_gas_date >= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -188,10 +190,10 @@
                 <div class="col-sm-2 form-group">
                   <label for="endHandDate" class="font_normal_body">&emsp;&emsp;&emsp;至</label>
                   <datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endOpenDate"
-                              :value.sync="model.endOpenDate"
+                              v-model="model.endGasDate"
+                              :value.sync="model.endGasDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_open_date <= '{}'"
+                              condition="f_gas_date <= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -200,9 +202,10 @@
                   <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
                             v-model="model.f_inputtor"
+                            :multiple="true"
                             :options='$parent.$parent.inputtores' placeholder='请选择'
-                            condition="f_inputtor = '{}'"
-                            close-on-select :search="false">
+                            condition="f_inputtor in {}"
+                            :search="false">
                   </v-select>
                 </div>
               </div>
@@ -293,7 +296,7 @@
                   <nobr>期末底数</nobr>
                 </th>
                 <th>
-                  <nobr>建档日期</nobr>
+                  <nobr>通气时间</nobr>
                 </th>
               </tr>
             </template>
@@ -386,7 +389,7 @@
                 <nobr>{{row.f_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_createfile_date}}</nobr>
+                <nobr>{{row.f_gas_date}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>
@@ -480,7 +483,7 @@ import exportConfig from '../config/exportConfig'
         printshow: false,
         all: false,
         fields: {},
-        inputtores: [],
+        inputtores:[{label: '全部',value: ''}],
         thead: '',
         tfoot: '',
         //表册片区
@@ -502,6 +505,7 @@ import exportConfig from '../config/exportConfig'
     },
     ready () {
       readySomething(this)
+      this.getinputtores()
     },
     methods: {
       initParams(){
@@ -531,16 +535,19 @@ import exportConfig from '../config/exportConfig'
           })
         }
       },
-      async updateParams() {
-        await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: '全部', value: ''})
-        this.initSlice(this.f_filialeid)
-        if (this.allorgid != null) {
-          this.allorgid.forEach((res) => {
-            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
-          })
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
         }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
       },
       //表册片区和抄表册关联
       async inputtorchange(){
@@ -623,7 +630,7 @@ import exportConfig from '../config/exportConfig'
       userTypeChange () {
         this.gasproperties = []
         if (this.$refs.paged.$refs.cri.model !== null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.$refs.paged.$refs.cri.model.f_gasproperties = []
 
           console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -451,19 +451,19 @@
                               condition="f_table_state in {}"></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">档案抄表员</label>
+                    <label class="font_normal_body">表册抄表员</label>
                     <v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表册抄表员</label>
+                    <label class="font_normal_body">档案抄表员</label>
                     <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/filiale/WEINAN/ResSelectGroupNew.vue

@@ -6,10 +6,11 @@
                 :initresid='initres.org'></right-tree>
   </div>
   <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <label class="font_normal_body" v-html="deptitle"></label>
     <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
+                :specialquery="specialquery"
                 :initresid='initres.dep'
                 :mustselect="mustselect"
                 :is-mul="mul">
@@ -62,6 +63,11 @@ export default {
       type: Object,
       default: null,
     },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
     showComponent:{
       default:['company','department','operator','slicearea']
     },
@@ -88,6 +94,7 @@ export default {
       operatorshow:false,
       sliceareashow:false,
       mustselect:false,
+      deptitle: this.specialquery ? '营&ensp;业&ensp;厅' : '部&emsp;&emsp;门',
       obj:{
         orgnames:[],
         depnames:[],

package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue

@@ -62,6 +62,7 @@
                   :show-component="['company','department','operator']"
                   :initres="$parent.$parent.initres"
                   @re-res="$parent.$parent.getRes"
+                  :specialquery="true"
                   v-ref:sel
                 ></res-select-group>
                 <div class="col-sm-2 form-group">