npm - manage-client - Versions diffs - 3.3.117 → 3.3.118 - Mend

manage-client 3.3.117 → 3.3.118

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.117",
+  "version": "3.3.118",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/DayStairMoney.vue CHANGED Viewed

@@ -26,6 +26,26 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+          <div class="col-sm-3" >
+            <label class="font_normal_body" for="startDate1">上报日期</label>
+            <datepicker id="startDate" placeholder="上报开始日期" style="width: 60%"
+                        v-model="model.startDate1"
+                        :value.sync="model.startDate1"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd 00:00:00'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3" >
+            <label  class="font_normal_body" for="endDate1">上报日期</label>
+            <datepicker id="endDate" placeholder="上报结束日期" style="width: 60%"
+                        v-model="model.endDate1"
+                        :value.sync="model.endDate1"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd 23:59:59'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
           <div class="col-sm-3">
             <label class="font_normal_body">气表品牌</label>
             <v-select :value.sync="model.gasbrand"
@@ -154,7 +174,7 @@
         depname: '',
         operatorname: '',
         orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/mgetEveryDaySummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid',newWebHand: !!this.$appdata.getSingleValue('新抄表')}),
+        model: new DataModel('rs/report/mgetEveryDaySummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1', f_orgid: 'this.model.f_orgid',newWebHand: !!this.$appdata.getSingleValue('新抄表')}),
         reportStr: null,
         show: false,
         spans: ''

package/src/components/SellReport/MonthStairMoney.vue CHANGED Viewed

@@ -26,6 +26,26 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
+          <div class="col-sm-3" >
+            <label class="font_normal_body" for="startDate1">上报日期</label>
+            <datepicker id="startDate" placeholder="上报开始日期" style="width: 60%"
+                        v-model="model.startDate1"
+                        :value.sync="model.startDate1"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd 00:00:00'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3" >
+            <label  class="font_normal_body" for="endDate1">上报日期</label>
+            <datepicker id="endDate" placeholder="上报结束日期" style="width: 60%"
+                        v-model="model.endDate1"
+                        :value.sync="model.endDate1"
+                        :disabled-days-of-Week="[]"
+                        :format="'yyyy-MM-dd 23:59:59'"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
           <div class="col-sm-3">
             <label class="font_normal_body">气表品牌</label>
             <v-select :value.sync="model.gasbrand"
@@ -154,7 +174,7 @@
         depname: '',
         operatorname: '',
         orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/mgetEveryMonthSummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid',newWebHand: !!this.$appdata.getSingleValue('新抄表')}),
+        model: new DataModel('rs/report/mgetEveryMonthSummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1', f_orgid: 'this.model.f_orgid',newWebHand: !!this.$appdata.getSingleValue('新抄表')}),
         reportStr: null,
         show: false,
         spans: ''

package/src/components/sale/businessquery/BusinessManage.vue CHANGED Viewed

@@ -121,6 +121,9 @@
     <tabs header="受理单查询"  v-if="permission('受理单查询')">
       <print-sheet-query  @deal-msg="dealMsg" :selectorg.sync="selectOrgid" ></print-sheet-query>
     </tabs>
+    <tabs header="开关阀记录查询" v-if="permission('开关阀记录查询')">
+      <operation-value-record ></operation-value-record>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

package/src/components/sale/businessquery/DisableQuery.vue CHANGED Viewed

@@ -157,9 +157,6 @@
                 <th>
                   <nobr>联系电话</nobr>
                 </th>
-                <th>
-                  <nobr>客户电话</nobr>
-                </th>
                 <th>
                   <nobr>用气点名称</nobr>
                 </th>
@@ -220,9 +217,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.cy_lxr}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_userfiles_address}}</nobr>
               </td>

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

@@ -174,6 +174,37 @@
                   <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtamount_big"
                          condition="f_oughtamount <= '{}' " placeholder="小于等于">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label for="startHandDate" class="font_normal_body">开户时间</label>
+                  <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startOpenDate"
+                              :value.sync="model.startOpenDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_open_date >= '{}'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <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"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="f_open_date <= '{}'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            condition="f_inputtor = '{}'"
+                            close-on-select :search="false">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -449,6 +480,7 @@ import exportConfig from '../config/exportConfig'
         printshow: false,
         all: false,
         fields: {},
+        inputtores: [],
         thead: '',
         tfoot: '',
         //表册片区
@@ -499,6 +531,17 @@ 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 inputtorchange(){
         /*let val1=this.$refs.paged.$refs.cri.model.f_meter_book*/
@@ -739,6 +782,7 @@ import exportConfig from '../config/exportConfig'
           let a = val.substring(val.indexOf("(")+2)
           await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
         }
+        this.updateParams()
       },
     }
   }

package/src/components/sale/config/exportConfig.js CHANGED Viewed

@@ -424,7 +424,10 @@ export default{
     "f_date": "抄表区间",
     "f_input_day": "天数",
     "f_oughtamount": "用气量",
-    "f_oughtfee": "用气金额"
+    "f_oughtfee": "用气金额",
+    "f_last_tablebase": "期初底数",
+    "f_tablebase": "期末底数",
+    "f_createfile_date": "建档日期"
   },
   notgasConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'f_credentials': '证件类型',
@@ -561,7 +564,7 @@ export default{
     'sep': '九月', 'oct': '十月', 'nov': '十一月', 'dec': '十二月', 'sum_oughtamount': '累计气量'
   },
   disableConfig: {
-    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话', 'cy_lxr': '常用联系人',
+    'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_phone': '客户电话',
     'f_userfiles_address': '用气点名称', 'f_address': '客户地址', 'f_disable_reason': '停用原因',
     'f_othereason': '其他原因', 'f_comments': '备注', 'f_state': '停用状态',
     'f_operate_date': '停用日期', 'f_operat_type': '操作类型', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号','f_meter_brand':'气表品牌'

package/src/components/webmeter/WebmeterQuery.vue CHANGED Viewed

@@ -39,9 +39,6 @@
     <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
       <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
     </tabs>
-    <tabs header="开关阀记录查询" v-if="permission('开关阀记录查询')">
-      <operation-value-record v-if="show.includes('开关阀记录查询')"></operation-value-record>
-    </tabs>
   </tab-button>
 </template>

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

@@ -184,8 +184,8 @@ import defaultPrint from '../config/DefaultPrint'
 import exportConfig from '../config/exportConfig'
 let readySomething = async function (self) {
-  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+  self.startDate = self.$login.toStandardDateString()
+  self.endDate = self.$login.toStandardDateString()
   self.getAreaList()
 }
 export default {
@@ -323,6 +323,8 @@ export default {
       } else {
         args.condition = `${args.condition}` + this.orgConditionStr
       }
+      this.$refs.paged.$refs.cri.model.startDate = this.startDate
+      this.$refs.paged.$refs.cri.model.endDate = this.endDate
       this.condition = args.condition
       console.log("查看条件", this.condition)
       await this.model.search(args.condition, args.model)

package/src/filiale/meihekou/ChargeQuery.vue CHANGED Viewed

@@ -34,7 +34,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name = '{}'" placeholder="客户名称">
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
                 <div class="span" style="float:right;">

package/src/filiale/wenxi/DisableQuery.vue CHANGED Viewed

@@ -168,9 +168,6 @@
                 <th>
                   <nobr>操作类型</nobr>
                 </th>
-                <th>
-                  <nobr>客户电话</nobr>
-                </th>
                 <th>
                   <nobr>用气点名称</nobr>
                 </th>
@@ -234,9 +231,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operat_type}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.cy_lxr}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_userfiles_address}}</nobr>
               </td>