sale-client 3.6.243 → 3.6.246

package/package.json

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

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -148,9 +148,16 @@ export default {
                     i--
                     continue
                   }
+                  if ((res.data.array[j].fusetype == '安检照片' && res.data.array[j].f_filename.includes('amr'))) {
+                    continue
+                  }
                   let temp = res.data.array[j].f_downloadpath
                   let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
-                  res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  if (res.data.array[j].fusetype == '安检照片') {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                  } else {
+                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                  }
                   this.files[i].arrays.push(res.data.array[j])
                 }
               }

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -86,7 +86,7 @@
               <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_changetables_reason}}/{{row.f_reason}}/{{row.f_othereason}}</nobr></td>
             </tr>
           </template>
           <template partial='foot'></template>

package/src/filiale/tongchuan/UserBaseInfoNew.vue

@@ -108,6 +108,16 @@
           <label class="font_normal_body_new">左&ensp;右&ensp;表</label>
           <input class="input-underline" style="width:60%" :value="row.f_aroundmeter" readonly>
         </div>
+        <div class="col-sm-4">
+        </div>
+      <div class="col-sm-4" v-if="row.f_last_check_date">
+        <label class="font_normal_body_new">最后安检时间</label>
+        <input class="input-underline" style="width:45%" :value="row.f_last_check_date" readonly>
+      </div>
+      <div class="col-sm-4" v-if="row.f_last_check_state">
+        <label class="font_normal_body_new">安检状态</label>
+        <input class="input-underline" style="width:45%" :value="row.f_last_check_state" readonly>
+      </div>
     </div>
   </div>
   <div class="auto" style="float: right;">

package/src/filiale/wenxi/CardService.js

@@ -247,6 +247,7 @@ let CardService = {
       f_balance: row.f_balance,
       f_meter_type: row.f_meter_type,
       f_preamount: model.f_preamount,
+      isGasValue: model.f_pregas ? 0 : 1,
       f_total_gas: (row.f_total_gas - 0) + (model.f_pregas - 0),
       f_write_totalgas: (row.f_write_totalgas - 0) + (model.f_pregas - 0),
       f_write_totalfee: (row.f_write_totalfee - 0) + (model.xiekamoney - 0),

package/src/filiale/wenxi/MarginCompensation.vue

@@ -28,13 +28,13 @@
 <!--                      style="width:60%"-->
 <!--                      close-on-select></v-select>-->
 <!--          </div>-->
-<!--          <div v-if="this.data.f_collection_type==='按金额'" class="col-sm-4 form-group"-->
-<!--               :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">-->
-<!--            <label class="font_normal_body">&nbsp;金额&nbsp;</label>-->
-<!--            <input class="input_search" type="number" v-model="model.f_preamount" style="width:60%"-->
-<!--                   v-validate:f_preamount='{required: true,  dctest: [0, ">" ]}' placeholder="金额">-->
-<!--          </div>-->
-          <div class="col-sm-4 form-group"
+          <div v-if="row.f_meter_type === '金额卡表'" class="col-sm-4 form-group"
+               :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;金额&nbsp;</label>
+            <input class="input_search" type="number" v-model="model.f_preamount" style="width:60%"
+                   v-validate:f_preamount='{required: true,  dctest: [0, ">" ]}' placeholder="金额">
+          </div>
+          <div v-if="row.f_meter_type === '气量卡表'" class="col-sm-4 form-group"
                :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
             <label class="font_normal_body">&nbsp;气量&nbsp;</label>
             <input class="input_search" type="number" v-model="model.f_pregas" style="width:60%"
@@ -120,7 +120,7 @@ export default {
           f_purchase: 0,
           f_payment: ['现金收费'],
           f_pregas: '',
-          f_preamount: 0,
+          f_preamount: '',
           f_totalcost: 0,
           f_curbalance: 0,
           f_collection: 0,

package/src/plugins/CardService.js

@@ -267,6 +267,7 @@ let CardService = {
       f_voucher_number: model.f_voucher_number,
       userinfo_version: row.userinfo_version,
       version: row.version,
+      isGasValue: model.f_pregas ? 0 : 1,
       f_meter_base: row.f_meter_base,
       f_operator: Vue.$login.f.name,
       f_operatorid: Vue.$login.f.id,

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Jan 23 18:15:26 CST 2024
-gradle.version=5.2.1