sale-client 3.5.290 → 3.5.291

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.290",
+  "version": "3.5.291",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -74,7 +74,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.62",
+    "ldap-clients": "3.0.48",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",
@@ -89,7 +89,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.64",
+    "system-clients": "3.2.55",
     "url-loader": "^0.5.7",
     "vue-client": "1.24.79",
     "vue-clipboard2": "0.3.1",

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -45,6 +45,7 @@ export default {
         id: obj.f_eticket_id,
         f_bill_code: obj.f_bill_code ? obj.f_bill_code : undefined,
         f_bill_number: obj.f_bill_number ? obj.f_bill_number : undefined,
+        f_fpqqlsh: obj.fpqqlsh ? obj.fpqqlsh : undefined,
         f_jym: obj.f_jym ? obj.f_jym : undefined,
         f_bill_url: obj.f_bill_url ? obj.f_bill_url : undefined,
         f_red_url: obj.f_red_url ? obj.f_red_url : undefined,
@@ -132,12 +133,11 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
-            f_sign_url: req.shareurl,
-            f_sign_result: req.sharecode,
+            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
+            f_sign_result: req.msg,
             f_bill_state: req.status
           }
-          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
+          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -202,6 +202,7 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
+                  fpqqlsh: req.fpqqlsh,
                   f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
                   f_sign_result: req.msg,
                   f_bill_state: req.status
@@ -304,12 +305,12 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
-                  f_sign_url: req.shareurl,
-                  f_sign_result: req.sharecode,
+                  fpqqlsh: req.fpqqlsh,
+                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
+                  f_sign_result: req.msg,
                   f_bill_state: req.status
                 })
-                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
+                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/shanxian/UserDeviceInfoTest.vue

@@ -156,6 +156,14 @@
                             :options='row.pipetypes' placeholder='管道类型' :value-single="true"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" title="参数名称:[连接方式]">
+                  <label class="font_normal_body">连接方式</label>
+                  <v-select :value.sync="row.f_pipe_way" v-model="row.f_pipe_way"
+                            :options='row.pipeways' placeholder='连接方式' :value-single="true"
+                            close-on-select></v-select>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body" title="连接管安装日期">安装日期</label>
                   <datepicker placeholder="连接管安装日期" style="width: 60%"
@@ -165,8 +173,6 @@
                               :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
-              </div>
-              <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="pipeShow">
                   <label class="font_normal_body" title="连接管到期日期">到期日期</label>
                   <datepicker placeholder="连接管到期日期" style="width: 60%"
@@ -175,21 +181,22 @@
                               :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">使用年限</label>
                   <input type="number" class="input_search" style="width: 60%" v-model="row.f_service_liferg"
                          :value.sync="row.f_service_liferg"
                          :onchange="pipeExpireDate($index)" >
                 </div>
-
-              </div>
-              <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;米&nbsp;&nbsp;&nbsp;数</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_pipe_length"
                          :value.sync="row.f_pipe_length"
                          placeholder='米数'>
                 </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;材&nbsp;&nbsp;&nbsp;质</label>
                   <input type="text" class="input_search" style="width:60%" v-model="row.f_pipe_material"
@@ -225,6 +232,7 @@
                 <th style="text-align: center">设备品牌</th>
                 <th style="text-align: center">设备型号</th>
                 <th style="text-align: center">管道类型</th>
+                <th style="text-align: center">连接方式</th>
                 <th style="text-align: center">管道米数</th>
                 <th style="text-align: center">安装人</th>
                 <th style="text-align: center">安装方式</th>
@@ -242,6 +250,7 @@
                 <td style="text-align: center">{{row.f_brand}}</td>
                 <td style="text-align: center">{{row.f_devices_model}}</td>
                 <td style="text-align: center">{{row.f_pipe_type}}</td>
+                <td style="text-align: center">{{row.f_pipe_way}}</td>
                 <td style="text-align: center">{{row.f_pipe_length}}</td>
                 <td style="text-align:center">{{row.f_input_person}}</td>
                 <td style="text-align:center">{{row.f_install_type}}</td>
@@ -285,6 +294,7 @@ export default {
       devicetypes: this.$appdata.getParam('设备类型'),
       devicebrands: [],
       pipetypes:[],
+      pipeways: this.$appdata.getParam('连接方式'),
       pipetypeparams: this.$appdata.getParam('管道类型'),
       WatchPurchases: this.$appdata.getParam('购买方式'),
       installperson: this.$appdata.getParam('安装人'),
@@ -404,6 +414,7 @@ export default {
         f_input_date: this.$login.toStandardTimeString(),
         devicetypes: this.$appdata.getParam('设备类型'),
         pipetypes:[],
+        pipeways: this.$appdata.getParam('连接方式'),
         devicebrands:[]
       })
     },

package/src/filiale/xiangyun/IOTRefund.vue

@@ -172,17 +172,20 @@
         }
         console.log('退费传参', param)
         let res = await this.$resetpost('rs/logic/iotRefund', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行退费吗？`, resolveMsg: '退费成功！！', rejectMsg: '退费失败！！请重试！！'}).then((res) => {
-          if (this.config.hasBillManage) {
-            // 启用发票管理，获取票据管理中的票号并存储记录
-            this.data.id = res.data.id
-            this.data.f_bill_type = '退费'
-            this.print = true
+          if (this.config.hasPrint) {
+            if (this.config.hasBillManage) {
+              // 启用发票管理，获取票据管理中的票号并存储记录
+              this.data.id = res.data.id
+              this.data.f_bill_type = '退费'
+              this.print = true
+            } else {
+              this.data.id = res.data.id
+              this.print = true
+            }
           } else {
-            this.data.id = res.data.id
-            this.print = true
+            this.$dispatch('success')
           }
         })
-        this.$dispatch('success')
       },
       changeChoose () {
         this.$dispatch('changeChoose')