sale-client 3.6.294 → 3.6.296

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.294",
+  "version": "3.6.296",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/Common/LimitGas.vue

@@ -142,11 +142,11 @@
           f_third_pay: '0',
           f_time_type: '按月',
           f_limit_times: '',
-          f_time_value: '',
+          f_time_value: '0',
           f_limit_type: '气量',
           f_limit_style:'',
-          f_limit_value: 0,
-          f_limit_amount: 0,
+          f_limit_value: '',
+          f_limit_amount: '',
           f_start_date: this.$login.toStandardDateString()
         },
         limitshow: false,
@@ -191,12 +191,12 @@
         this.model = {
           f_third_pay: this.model.f_third_pay,
           f_time_type: this.model.f_time_type,
-          f_limit_times: '',
-          f_time_value: '',
-          f_limit_type: '气量',
-          f_limit_style:'',
-          f_limit_value: 0,
-          f_limit_amount: 0,
+          f_limit_times: this.model.f_limit_times,
+          f_time_value: this.model.f_time_value,
+          f_limit_type: this.model.f_limit_type,
+          f_limit_style: this.model.f_limit_style,
+          f_limit_value: this.model.f_limit_value,
+          f_limit_amount: this.model.f_limit_amount,
           f_start_date: this.$login.toStandardDateString()
         }
         console.log('提交限购数据', this.model)

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -707,9 +707,9 @@
             f_result_state = row.f_result_state
           }
           let f_input_date = ''
-          if (row.f_input_date && row.f_input_date != '') {
-            f_input_date = ` ,f_input_date = '${row.f_input_date}'`
-          }
+          // if (row.f_input_date && row.f_input_date != '') {
+          //   f_input_date = ` ,f_input_date = '${row.f_input_date}'`
+          // }
           let sqldata = `update t_handplan set f_result_state = '${f_result_state}' ${f_input_date} where id = '${row.id}'`
           this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: '业务单号保存失败'})
           //   }).catch((error) => {

package/src/filiale/haile/machineHand.vue

@@ -1634,9 +1634,9 @@ export default {
           f_result_state = row.f_result_state
         }
         let f_input_date = ''
-        if (row.f_input_date && row.f_input_date != '') {
-          f_input_date = ` ,f_input_date = '${row.f_input_date}'`
-        }
+        // if (row.f_input_date && row.f_input_date != '') {
+        //   f_input_date = ` ,f_input_date = '${row.f_input_date}'`
+        // }
         let sqldata = `update t_handplan set f_result_state = '${f_result_state}' ${f_input_date} where id = '${row.id}'`
         this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {
           resolveMsg: null,

package/src/filiale/rongchuang/bill/EticketRecordList.vue

@@ -113,7 +113,6 @@
             <th>合计金额</th>
             <th>收费类型</th>
             <th>收费时间</th>
-            <th>发票代码</th>
             <th>是否征税</th>
             <th>票据状态</th>
             <th>发票号码</th>
@@ -132,7 +131,6 @@
           <td style="text-align:center">{{row.f_total_money}}</td>
           <td style="text-align:center">{{row.f_charge_type}}</td>
           <td style="text-align:center">{{row.f_operate_date}}</td>
-          <td style="text-align:center">{{row.f_bill_code}}</td>
           <td style="text-align:center">{{row.f_tax_logotype}}</td>
           <td style="text-align:center">{{row.f_bill_state}}</td>
           <td style="text-align:center">{{row.f_bill_number}}</td>

package/src/filiale/yangchun/OtherChargeNew.vue

@@ -8,15 +8,17 @@
           <!--          </div>-->
           <div style="margin-top:10px;" v-for="(index, row) in model.otherdetail">
             <div class="row">
-              <div class="col-sm-4" :class="{'select-error': row.f_brand_spec.length === 0 && config.checkFlag}">
+              <div class="col-sm-4" :class="[$v.brandspec.required ? 'select-error' : '']">
                 <label for="f_brand_spec" class="font_normal_body " title="参数名称：品名及规格">{{brandType}}</label>
+                <input type="text" class="input_search" style="width: 60%" v-show="false"
+                       v-model="$refs.brandspec.selectedItems" v-validate:brandspec='{required: true }'>
                 <v-select id="f_brand_spec"
                           placeholder='请选择'
                           v-model="row.f_brand_spec"
                           :value.sync="row.f_brand_spec"
                           :options='brandspec'
                           @change="setTypename(row,index)"
-                          close-on-select clear-button>
+                          close-on-select clear-button v-ref:brandspec>
                 </v-select>
               </div>
               <div class="col-sm-4" :class="{'has-success':row.f_typename,'has-error':!row.f_typename}">
@@ -31,7 +33,7 @@
                   close-on-select clear-button>
                 </v-select>
               </div>
-              <div class="col-sm-4" :class="{'has-success':row.f_typenumber,'has-error':!row.f_typenumber}">
+              <div class="col-sm-4" >
                 <label for="f_typenumber" class=" font_normal_body">&nbsp;型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
                 <v-select
                   style="width: 100px"
@@ -47,7 +49,7 @@
             <div class="row">
               <div class="col-sm-4" :class="{'has-success':row.f_unitprice,'has-error':!row.f_unitprice}">
                 <label style="" for="f_unitprice" class=" font_normal_body">*单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;价</label>
-                <input class="input_search" style="width:60%" type="number" min="1" @input.prevent="getcollection()"
+                <input class="input_search" style=" width:60%" type="number" min="1" @input.prevent="getcollection()"
                        v-model="row.f_unitprice"
                        :value.sync="row.f_unitprice"
                        :disabled="false"
@@ -207,7 +209,6 @@ let otherChargeGen = async function (self, parameter) {
   try {
     // 加入扫码盒付款码支付流水号
     self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-    console.log('11111', self.model)
     let resid = await self.$LogicService.otherCharge(self.model, self.row)
     console.log('其他收费返回id', resid, self.config.hasPrint, self.$login.r.includes('不打印发票'))
     if (self.config.showupload) {
@@ -224,8 +225,6 @@ let otherChargeGen = async function (self, parameter) {
     if (self.config.dispatch) {
       await self.$showMessage(`是否添加派工单`, ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          console.log('其他收费xinxi', self.model)
-          console.log('其他收费xinxi', self.row)
           let batch = {
             sf_id: resid.data,
             f_userinfo_code: self.row.f_userinfo_code,
@@ -241,7 +240,6 @@ let otherChargeGen = async function (self, parameter) {
             f_orgid: self.$login.f.orgid,
             f_dispathch_state: '待分配'
           }
-          console.log('111:', batch)
           self.$resetpost('rs/logic/savePatch', batch).then((res1) => {
             // this.params.rows.splice(index, 1)
             console.log('更新成功！', res1.data.id)
@@ -333,7 +331,7 @@ export default {
         t_userfees: '',
         f_fee_type: ['其他费用'],
         f_fee_time: ['12'],
-        otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: '', f_overlength_number: 0, f_overlength_unitprice: 0, f_discounts_money_detail: 0, f_actual_materials_detail: ''}]
+        otherdetail: [{f_brand_spec: [], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: '', f_overlength_number: 0, f_overlength_unitprice: 0, f_discounts_money_detail: 0, f_actual_materials_detail: ''}]
       },
       eticket_msg: false,
       mjshow: false,
@@ -630,7 +628,7 @@ export default {
       this.model.f_discounts_money += (this.model.f_discounts_money_materials - 0)
     },
     addadetail () {
-      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [''], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: '', f_overlength_number: 0, f_overlength_unitprice: 0, f_discounts_money_detail: 0, f_actual_materials_detail: ''})
+      this.$set(`model.otherdetail[${this.model.otherdetail.length}]`, {f_brand_spec: [], f_typenumber: '', typeNameList: [], typenumberList: [], f_unitprice: '', f_number: '', f_overlength_number: 0, f_overlength_unitprice: 0, f_discounts_money_detail: 0, f_actual_materials_detail: ''})
       console.log(JSON.stringify(this.model.otherdetail))
     },
     delthisdetail (index) {

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed May 15 09:49:58 CST 2024
-gradle.version=7.4