sale-client 3.5.289 → 3.5.291

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [localUrl, serverRul] = ['https://qnjtkf.cn:7400/#', 'https://qnjtkf.cn:7400/#']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: serverRul
       },
+      '/invoice': {
+        target: serverRul
+      },
       // 查找资源服务数据
       '/rs/search': {
         target: serverRul

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.289",
+  "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/components/charge/gasloss/gasLossManage.vue

@@ -14,7 +14,6 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
   export default {
     title: '气损收费',
     name: 'gasLossManage',
@@ -22,8 +21,6 @@
       return {
         showupload: false,
         showAddMssage: false,
-
-
         showItem: false
       }
     },

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -7,7 +7,6 @@
             <div style="height:550px;overflow-y: auto;">
             <div style="margin-top:10px;" class="auto row" v-for="row in model.gaslossdetail">
               <div class="panel panel-primary datapanel" style="background-color: #f4f6f8">
-<!--                <div class="auto row">-->
                   <div class="col-sm-4 form-group" :class="{'has-success':row.f_type,'has-error':!row.f_type}">
                     <label for="f_brand_spec" class="font_normal_body" title="参数名称：气损分类">气损分类</label>
                     <input v-show="false" v-model="row.f_type" v-validate:f_type='{required: true }'>
@@ -50,107 +49,89 @@
                     <button type="button" class="glyphicon glyphicon-minus btn-danger" @click.stop="delthisdetail($index)"></button>
                     <button type="button" class="glyphicon glyphicon-plus btn-success" @click.stop="addadetail()"></button>
                   </div>
-<!--                </div>-->
               </div>
             </div>
           </div>
-              <div class=" panel panel-primary datapanel" style="height:260px">
-                <div class="row">
-                  <div class="col-sm-4 form-group">
-                    <label class=" font_normal_body">&emsp;客户编号</label>
-                    <input class="input_search" style="width:60%"
-                           v-model="model.f_userinfo_code"
-                           @blur="codeChange()"
-                           placeholder="客户编号">
-                  </div>
-                  <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_person,'has-error':!model.f_charge_person}">
-                    <label class=" font_normal_body">&emsp;缴&nbsp;费&nbsp;人&nbsp;</label>
-                    <input class="input_search" style="width:60%"
-                           v-validate:f_charge_person='{required: true }'
-                           v-model="model.f_charge_person"
-                           placeholder="缴费人">
-                  </div>
-                  <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_phone,'has-error':!model.f_charge_phone}">
-                    <label class=" font_normal_body">&emsp;联系电话</label>
-                    <input class="input_search" style="width:60%"
-                           v-validate:f_charge_phone='{required: true }'
-                           v-model="model.f_charge_phone"
-                           placeholder="联系电话">
-                  </div>
-                  <div class="col-sm-12 form-group" :class="{'has-success':model.f_charge_address,'has-error':!model.f_charge_address}">
-                    <label class=" font_normal_body">缴费人地址</label>
-                    <input class="input_search" style="width:89%"
-                           v-validate:f_charge_address='{required: true }'
-                           v-model="model.f_charge_address"
-                           placeholder="缴费人地址">
-                  </div>
-                  <div class="col-sm-4 form-group">
-                    <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">&emsp;收款方式</label>
-                    <v-select id="f_payment"
-                              v-model="f_payment"
-                              placeholder='请选择'
-                              :value.sync="model.f_payment"
-                              :value-single="true"
-                              :options='paytype'
-                              close-on-select clear-button>
-                    </v-select>
-                  </div>
-                  <div class="col-sm-4 form-group">
-                    <label for="f_print" class="font_normal_body">&emsp;打印格式</label>
-                    <v-select id="print"
-                              v-model="model.f_print"
-                              placeholder='请选择'
-                              :value.sync="model.f_print"
-                              :options='printstyle'
-                              :value-single="true"
-                              close-on-select clear-button>
-                    </v-select>
-                  </div>
-                  <div class="col-sm-4 auto">
-                    <label for="f_collection" style="text-align:right;"><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款:{{model.f_collection}}</font></label>
-                  </div>
-                  <div class="col-sm-9 form-group">
-                    <label class=" font_normal_body">&emsp;备&emsp;&emsp;注</label>
-                    <input class="input_search" style="width:70%"
-                           v-model="model.f_comments"
-                           placeholder="备注">
-                  </div>
-                  <div style="text-align:right;height: 25%;">
-                    <button class="button_search btn-gn" type="button" @click="confirm()" :disabled='!$v.valid || validateOk'>确认</button>
-                    <button class="button_clear btn-gn" type="button" @click="clean()">取消</button>
-                  </div>
-                </div>
-
-                  <!--          <payment-code-button :clickable="!$v.valid || validateOk"-->
-                  <!--                               :payment.sync="model.f_payment" :payment-data="paytype"-->
-                  <!--                               @confirm-payment="confirm()">-->
-                  <!--          </payment-code-button>-->
-
-
+          </div>
+          <div class=" panel panel-primary datapanel" style="height:260px">
+            <div class="row">
+              <div class="col-sm-4 form-group">
+                <label class=" font_normal_body">&emsp;客户编号</label>
+                <input class="input_search" style="width:60%"
+                       v-model="model.f_userinfo_code"
+                       @blur="codeChange()"
+                       placeholder="客户编号">
               </div>
-            </div>
-
+              <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_person,'has-error':!model.f_charge_person}">
+                <label class=" font_normal_body">&emsp;缴&nbsp;费&nbsp;人&nbsp;</label>
+                <input class="input_search" style="width:60%"
+                       v-validate:f_charge_person='{required: true }'
+                       v-model="model.f_charge_person"
+                       placeholder="缴费人">
+              </div>
+              <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_phone,'has-error':!model.f_charge_phone}">
+                <label class=" font_normal_body">&emsp;联系电话</label>
+                <input class="input_search" style="width:60%"
+                       v-validate:f_charge_phone='{required: true }'
+                       v-model="model.f_charge_phone"
+                       placeholder="联系电话">
+              </div>
+              <div class="col-sm-12 form-group" :class="{'has-success':model.f_charge_address,'has-error':!model.f_charge_address}">
+                <label class=" font_normal_body">缴费人地址</label>
+                <input class="input_search" style="width:89%"
+                       v-validate:f_charge_address='{required: true }'
+                       v-model="model.f_charge_address"
+                       placeholder="缴费人地址">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">&emsp;收款方式</label>
+                <v-select id="f_payment"
+                          v-model="f_payment"
+                          placeholder='请选择'
+                          :value.sync="model.f_payment"
+                          :value-single="true"
+                          :options='paytype'
+                          close-on-select clear-button>
+                </v-select>
+              </div>
+              <div class="col-sm-4 form-group">
+                <label for="f_print" class="font_normal_body">&emsp;打印格式</label>
+                <v-select id="print"
+                          v-model="model.f_print"
+                          placeholder='请选择'
+                          :value.sync="model.f_print"
+                          :options='printstyle'
+                          :value-single="true"
+                          close-on-select clear-button>
+                </v-select>
+              </div>
+              <div class="col-sm-4 auto">
+                <label for="f_collection" style="text-align:right;"><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款:{{model.f_collection}}</font></label>
+              </div>
+              <div class="col-sm-9 form-group">
+                <label class=" font_normal_body">&emsp;备&emsp;&emsp;注</label>
+                <input class="input_search" style="width:70%"
+                       v-model="model.f_comments"
+                       placeholder="备注">
+              </div>
+              <div style="text-align:right;height: 25%;">
+                <button class="button_search btn-gn" type="button" @click="checkInvoiceMsg()" :disabled='!$v.valid || validateOk'>确认</button>
+                <button class="button_clear btn-gn" type="button" @click="clean()">取消</button>
+              </div>
+              </div>
+          </div>
         </form>
         <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
         <print-bill :show="print" :data='model' :bill-config='config' :bill-data='billData' v-on:toggle="close" @printok="printok" v-ref:printbill></print-bill>
-        <!-- <print-other-charge-bill :show="print" v-ref:printbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></print-other-charge-bill> -->
-        <!-- <tax-other-bill :show="taxprint"  v-ref:taxprintbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></tax-other-bill> -->
-
+        <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+        <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="model" @confirm="confirm"></eticket-modal>
       </validator>
-
     </div>
-
     <payment-code v-ref:paymentcode :payment="model.f_payment"  :money="model.f_collection"></payment-code>
-
   </div>
-<!--  <div class="auto">-->
-<!--    <upload isremark="true" fusetype="气损收费"></upload>-->
-<!--  </div>-->
 </template>
 
-
 <script>
-
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
 
@@ -158,35 +139,28 @@
     try {
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-      // let resid = await self.$LogicService.otherCharge(self.model, self.row)
-      self.model.f_bill_style=self.model.f_print
+      self.model.f_bill_style = self.model.f_print
       let http = new HttpResetClass()
-      self.model.f_describe=`${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`
+      self.model.f_describe = `${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`
       let resid = await http.load('POST', 'rs/logic/gasLoss', self.model, {resolveMsg: '气损收费成功', rejectMsg: '气损收费失败'})
       console.log('f_print:', resid)
-      if (true) {
-        if (self.model.f_print != '电子发票') {
-          if (self.config.hasBillManage) {
-            self.model.id = resid.data
-            self.model.f_bill_type = '其他费用'
-            self.model.f_bill_style = self.model.f_print[0]
-            self.print = true
-          } else {
-            self.model.id = resid.data
-            self.print = true
-          }
-        } else if (self.model.f_print === '国税发票') {
-          // TODO
-          self.clean()
-          self.$dispatch('refresh')
-        } else if (self.model.f_print === '电子发票') {
-          self.$CommonService.openEticket(resid, '其他费用')
-          self.clean()
-          self.$dispatch('refresh')
+      if (self.model.f_print !== '电子发票') {
+        if (self.config.hasBillManage) {
+          self.model.id = resid.data
+          self.model.f_bill_type = '其他费用'
+          self.model.f_bill_style = self.model.f_print[0]
+          self.print = true
+        } else {
+          self.model.id = resid.data
+          self.print = true
         }
-      } else {
+      } else if (self.model.f_print === '国税发票') {
+        // TODO
         self.clean()
         self.$dispatch('refresh')
+      } else if (self.model.f_print === '电子发票') {
+        self.eticket_show = true
+        await self.$refs.eticketbill.openETicket([resid.data], self.model, '气损收费')
       }
     } catch (error) {
       self.$showAlert(error, 'danger', 0)
@@ -195,9 +169,9 @@
   }
 
   let asyncGasLoss = async function (self) {
-    try{
+    try {
       await self.$getConfig(self, 'gasLossCharge')
-    } catch(error){
+    } catch (error) {
       console.log('无配置文件')
     }
     self.model.f_print = self.config.printType
@@ -219,10 +193,13 @@
           payment: '现金缴费',  // 付款方式
           f_type: '', // 气损分类
           f_loss_type: '' // 气损类型
-
         },
+        eticket_msg: false,
+        eticket_show: false,
+        invoice_is_pax: '征税',
+        is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         model: {
-          f_userinfo_id:null,
+          f_userinfo_id: null,
           f_collection: 0,
           f_payment: '',
           f_bill_style: '',
@@ -239,7 +216,15 @@
           f_depname: Vue.$login.f.deps,
           f_operat_type: '气损收费',
           f_print: '',
-          gaslossdetail:[{}]
+          gaslossdetail: [{}],
+          f_user_name: '',
+          f_user_phone: '',
+          f_address: '',
+          f_paper_name: '',
+          f_paper_account: '',
+          f_idnumber: '',
+          f_taxpayer_id: '',
+          f_address_phone: ''
         },
         print: false,
         taxprint: false,
@@ -263,36 +248,64 @@
     },
 
     methods: {
-      async codeChange(){
-        if(this.model.f_userinfo_code){
+      checkInvoiceMsg () {
+        if (this.model.f_print === '电子发票') {
+          if (!this.model.f_taxpayer_id) {
+            this.model.f_taxpayer_id = this.model.f_idnumber
+          }
+          if (!this.model.f_paper_name) {
+            this.model.f_paper_name = this.model.f_user_name
+          }
+          if (!this.model.f_address_phone) {
+            this.model.f_address_phone = this.model.f_address + ' ' + this.model.f_user_phone
+          }
+          this.eticket_msg = true
+        } else {
+          this.confirm()
+        }
+      },
+      eticket_toggle () {
+        this.eticket_show = false
+        this.$dispatch('success')
+      },
+      async codeChange () {
+        this.model.f_userinfo_code = this.model.f_userinfo_code.trim()
+        if (this.model.f_userinfo_code) {
           let http = new HttpResetClass()
           let res = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
             data: {
-              items: 'u.f_userinfo_id,u.f_user_name,u.f_user_phone,a.f_address',
+              items: 'u.f_userinfo_id,u.f_user_name,u.f_user_phone,a.f_address,u.f_paper_name,u.f_paper_account,u.f_idnumber,u.f_taxpayer_id,u.f_address_phone',
               tablename: 't_userinfo u  left join t_user_address a on u.f_userinfo_id = a.f_userinfo_id',
               condition: `u.f_userinfo_code = '${this.model.f_userinfo_code}' and u.f_user_state = '正常'`,
               orderitem: 'u.f_userinfo_id desc'
             }
           }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
-          if(res.data.length==0){
-            this.$showAlert('该客户编号不存在，请重新输入','warning',3000)
-            this.model.f_userinfo_code=null
-          }else{
-            this.model.f_userinfo_id=res.data[0].f_userinfo_id
-            this.model.f_charge_person=res.data[0].f_user_name
-            this.model.f_charge_phone=res.data[0].f_user_phone
-            this.model.f_charge_address=res.data[0].f_address
+          if (res.data.length == 0) {
+            this.$showAlert('该客户编号不存在，请重新输入', 'warning', 3000)
+            this.model.f_userinfo_code = null
+          } else {
+            this.model.f_userinfo_id = res.data[0].f_userinfo_id
+            this.model.f_charge_person = res.data[0].f_user_name
+            this.model.f_charge_phone = res.data[0].f_user_phone
+            this.model.f_charge_address = res.data[0].f_address
+            this.model.f_user_name = res.data[0].f_user_name
+            this.model.f_user_phone = res.data[0].f_user_phone
+            this.model.f_address = res.data[0].f_address
+            this.model.f_paper_name = res.data[0].f_paper_name
+            this.model.f_paper_account = res.data[0].f_paper_account
+            this.model.f_idnumber = res.data[0].f_idnumber
+            this.model.f_taxpayer_id = res.data[0].f_taxpayer_id
+            this.model.f_address_phone = res.data[0].f_address_phone
           }
-
         }
       },
-      async clean(){
+      async clean () {
         this.model = {}
         await this.$nextTick()
-        this.model={
+        this.model = {
+          f_userinfo_id: null,
           f_collection: 0,
-          f_payment: this.config.payment,
-          f_print: this.config.printType,
+          f_payment: '',
           f_bill_style: '',
           f_comments: '',
           f_charge_person: '',
@@ -306,16 +319,25 @@
           f_depid: Vue.$login.f.depids,
           f_depname: Vue.$login.f.deps,
           f_operat_type: '气损收费',
-          gaslossdetail:[{}]
+          f_print: '',
+          gaslossdetail: [{}],
+          f_user_name: '',
+          f_user_phone: '',
+          f_address: '',
+          f_paper_name: '',
+          f_paper_account: '',
+          f_idnumber: '',
+          f_taxpayer_id: '',
+          f_address_phone: ''
         }
       },
       async confirm () {
+        this.eticket_msg = false
         // // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
         this.$refs.paymentcode.paymentCodeShow = false
         console.log('付款码操作返回', ss)
         if (!ss.result) return
-
         gasLossGen(this)
       },
       close () {
@@ -350,7 +372,7 @@
           this.model.gaslossdetail.splice(index, 1)
           this.getcollection()
         }
-      },
+      }
     },
     computed: {
     }

package/src/components/revenue/base/rightview/carddetail/BlacklistDetail.vue

@@ -43,12 +43,9 @@ export default {
     }
   },
   ready () {
-    let sql = 'singleTable_OrderBy'
+    let sql = 'getBlack'
     let condition = {
-      items: '*',
-      tablename: 't_userinfo',
-      condition: ' f_userinfo_id = ' + this.data.f_userinfo_id,
-      orderitem: 'f_userinfo_id'
+      condition: ' tr.id = ' + this.data.id
     }
     this.$info(`加载数据中..., sql:${sql}`)
     this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {

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/qianneng/eticket/EticketRecordList.vue

@@ -135,7 +135,7 @@
             </th>
             <th style="text-align:center">
               <template v-if="row.f_invoice_source !== '外部录入'">
-                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功'"
+                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功' && row.f_tax_money > 0"
                         @click="$parent.$parent.$parent.fp_ch(row)">发票冲红
                 </button>
                 <button class="btn btn-link" v-if="row.f_bill_state==='待开票'"
@@ -144,6 +144,9 @@
                 <button class="btn btn-link" v-if="row.f_bill_state==='开票失败'"
                         @click="$parent.$parent.$parent.kp(row)">重新开票
                 </button>
+                <button class="btn btn-link" v-if="row.f_bill_state==='冲红失败'"
+                        @click="$parent.$parent.$parent.kp(row)">重新冲红
+                </button>
                 <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"
                         @click="$parent.$parent.$parent.fp_search(row)">电票查询
                 </button>
@@ -252,6 +255,10 @@ export default {
       this.eticket_show = true
       this.$refs.eticketbill.openEticketGen(row.id)
     },
+    ch (row) {
+      this.eticket_show = true
+      this.$refs.eticketbill.rushRedInvoice(row.id)
+    },
     eticket_toggle () {
       this.eticket_show = false
       this.show = false

package/src/filiale/shanxian/FileUserAddress.vue

@@ -73,23 +73,30 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_building.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
+                   v-validate:f_building='{required: true }'
                    placeholder="楼号"/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search"
+                   v-validate:f_unit='{required: true }'
+                   placeholder="单元"/>
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
+                   v-validate:f_floor='{required: true }'
                    placeholder="楼层" />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />

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')

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/tongchuan/sale'
+import wenxi from './filiale/qianneng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'