npm - sale-client - Versions diffs - 3.6.300 → 3.6.302 - Mend

sale-client 3.6.300 → 3.6.302

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 (16) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.300",
+  "version": "3.6.302",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.56",
+    "address-client": "3.2.105-yangchun",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",

package/src/components/FilesManage/FileUserAddress.vue CHANGED Viewed

@@ -472,14 +472,17 @@
         }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         let redata = []
         req.data.forEach((row) => {
-          redata.push({
-            label: row.f_residential_area,
-            value: row.id,
-            data: row,
-            id: row.id
-          })
+          if(!row.f_residential_area.includes('L')){
+            redata.push({
+              label: row.f_residential_area,
+              value: row.id,
+              data: row,
+              id: row.id
+            })
+          }
         })
         this.areaslist = redata
+        console.log('watch:areaslist',redata)
       },
       // 省/市/区变化
       async pcdChange (val) {

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue CHANGED Viewed

@@ -96,8 +96,8 @@
             <tr>
             <td style="text-align:center" v-show="false">{{row.f_hand_date.substring(0,7)}}</td>
               <th v-show="false"><nobr >{{row.datas}}</nobr></th>
-              <td style="text-align:center">{{row.f_input_date}}</td>
               <td style="text-align:center">{{row.f_hand_date}}</td>
+              <td style="text-align:center">{{row.f_input_date}}</td>
               <td style="text-align:center">{{row.f_last_tablebase}}</td>
               <td style="text-align:center">{{row.f_tablebase}}</td>
             <td style="text-align:center">{{row.f_balance}}</td>

package/src/components/revenue/Common/EticketPrint.vue CHANGED Viewed

@@ -80,7 +80,7 @@ export default {
           f_charge_type,
           retry,
           isTax: is_tax === '不征税' ? 0 : 1,
-          eticket_id: model.id,
+          eticket_id: retry ? model.id : null,
           invoice_kind: invoice_type,
           f_buy_openbank: model.f_paper_account,
           f_buy_phone: model.f_buy_phone,

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue CHANGED Viewed

@@ -304,13 +304,14 @@ export default {
   },
   methods: {
     async Rekp (row) {
+      console.log('重开参数' + JSON.stringify(row))
       this.eticket_show = true
       row.f_paper_name = row.f_user_name
       row.f_email = row.f_mail_push
       row.f_taxpayer_id = row.f_pay_id
       row.f_address_phone = row.f_buy_address_phone
       row.f_paper_accoun = row.f_buy_openbank
-      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, this.row.f_charge_type, this.row.f_paper_type, true)
+      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type, row.f_invoice_category, true)
     },
     search () {
       this.$refs.paged.$refs.cri.search()

package/src/components/webMeter/paramSave/ParamSet.vue CHANGED Viewed

@@ -110,6 +110,54 @@
                 close-on-select condition="f_gasproperties ='{}'">
               </v-select>
             </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">通气日期</label>
+              <datepicker id="f_gas_date" placeholder="开始时间" style="width:60%"
+                          v-model="model.f_start_date"
+                          :value.sync="model.f_start_date"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_gas_date >= '{}' "
+                          :show-reset-button="true">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">至&emsp;&emsp;&emsp;</label>
+              <datepicker id="f_gas_date" placeholder="结束时间" style="width:60%"
+                          v-model="model.f_end_date"
+                          :value.sync="model.f_end_date"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_gas_date <= '{}' "
+                          :show-reset-button="true">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">安装日期</label>
+              <datepicker id="f_install_date" placeholder="开始时间" style="width:60%"
+                          v-model="model.f_install_start"
+                          :value.sync="model.f_install_start"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_install_date >= '{}' "
+                          :show-reset-button="true">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">至&emsp;&emsp;&emsp;</label>
+              <datepicker id="f_gas_date" placeholder="结束时间" style="width:60%"
+                          v-model="model.f_install_end"
+                          :value.sync="model.f_install_end"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_install_date <= '{}' "
+                          :show-reset-button="true">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">用气地址</label>
+              <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
+                     v-model="model.f_address"
+                     placeholder='用气地址'
+                     condition="f_address like '%{}%'"
+              >
+            </div>
           </div>
         </div>
       </criteria>
@@ -148,7 +196,10 @@
               <nobr>气表型号</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>安装时间</nobr>
+              <nobr>安装日期</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>通气日期</nobr>
             </th>
             <th style="text-align:center">
               <nobr>阀门状态</nobr>
@@ -190,6 +241,9 @@
             <td style="text-align:center">
               <nobr>{{row.f_meter_style}}</nobr>
             </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_install_date}}</nobr>
+            </td>
             <td style="text-align:center">
               <nobr>{{row.f_gas_date}}</nobr>
             </td>
@@ -303,7 +357,8 @@ export default {
         'f_gasproperties': '用气性质',
         'f_user_name': '客户姓名',
         'f_address': '用气地址',
-        'f_gas_date': '安装时间',
+        'f_gas_date': '通气日期',
+        'f_install_date':'安装日期',
         'f_meternumber': '表钢号',
         'f_meter_brand': '气表品牌',
         'f_user_id': '表编号',
@@ -400,6 +455,7 @@ export default {
             this.conditionMsg = conditionMsg
             this.$resetpost('rs/sql/iot_getOpertionList', {data: {condition: this.condition}}, {resolveMsg: null, rejectMsg: null}).then((rat) => {
               this.user = rat.data
+              console.log('user',this.user.length,this.user)
               this.mapset(rat.data)
               this.showParame = !this.showParame
             })

package/src/filiale/haile/unHandplanQuery.vue CHANGED Viewed

@@ -134,6 +134,11 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_hand_month"
                          condition="f_hand_month  >= '{}' " placeholder="机表未抄期数">
                 </div>
+                <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_hand_month2"
+                         condition="f_hand_month2  >= '{}' " placeholder="机表已抄期数">
+                </div>
                 <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_webhand_day"
@@ -227,6 +232,9 @@
                 <th>
                   <nobr>机表未抄期数</nobr>
                 </th>
+                <th>
+                  <nobr>机表已抄期数</nobr>
+                </th>
                 <th>
                   <nobr>物联未报天数</nobr>
                 </th>
@@ -297,6 +305,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_hand_month}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_month2}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_webhand_day}}</nobr>
               </td>
@@ -399,6 +410,7 @@
             'f_oughtamount': '期间用气量',
             'f_oughtfee': '期间用气金额',
             'f_hand_month': '机表未抄期数',
+            'f_hand_month2': '机表已抄期数',
             'f_webhand_day': '物联未报天数',
             'f_depname': '部门',
             'f_orgname': '公司'
@@ -632,8 +644,6 @@
       dealmsg (val) {
         this.rowdata = val
         this.show = true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
       },
       close () {
         this.printshow = false

package/src/filiale/jingyang/GovernmentSell.vue CHANGED Viewed

@@ -1,5 +1,8 @@
 <template>
+  <div class="binary">
+    <div class="basic-main" >
+      <div class="flex" style="flex: 1;">
+        <div style="flex: 1.2">
     <criteria-paged :model="model" v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" novalidate  partial>
@@ -150,17 +153,21 @@
         </template>
       </data-grid>
     </criteria-paged>
-      <modal :show.sync="arrshow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
-        <article slot="modal-body" class="modal-body">
-          <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile"
-                       tagname="确定" multiple v-ref:file></file-upload>
-          <button class="button_clear btn-gn" style="margin-top: 10px;background-color: #6aa6e2;"
-                  @click="downloadFiles()">模板下载
-          </button>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-        </footer>
-      </modal>
+    </div>
+  </div>
+</div>
+</div>
+  <modal :show.sync="arrshow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile"
+                   tagname="确定" multiple v-ref:file></file-upload>
+      <button class="button_clear btn-gn" style="margin-top: 10px;background-color: #6aa6e2;"
+              @click="downloadFiles()">模板下载
+      </button>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 </template>
 <script>