sale-client 3.6.50 → 3.6.52

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/OffGasAddGas/OffGasAddGas.vue

@@ -5,13 +5,13 @@
         <div class="row" style="margin-top:10px;">
           <div class="col-sm-4"  :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
             <label class=" font_normal_body" >*补气量</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_pregas"
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_pregas" :readonly="!applyButtonShow"
                    v-validate:f_pregas='{required: true, dctest: [0, ">=" ]}'  placeholder="补气量">
           </div>
           <div class="col-sm-4">
             <label  for="f_pregas" class=" font_normal_body" >补气金额</label>
             <input class="input_search" style="width:60%" type="text" v-model="model.f_fillamount"
-                   v-validate:f_pregas='{required: true }'  placeholder="补气金额">
+                   v-validate:f_pregas='{required: true }' :readonly="!applyButtonShow" placeholder="补气金额">
           </div>
           <div class="col-sm-4">
             <label for="f_reason" class=" font_normal_body" >补气原因</label>
@@ -20,6 +20,7 @@
                       placeholder='补气原因'
                       :value.sync="model.f_reason"
                       :options='addGasReason'
+                      :disabled="!applyButtonShow"
                       close-on-select ></v-select>
           </div>
           <div class="col-sm-4">
@@ -30,6 +31,7 @@
                       value-single
                       :value.sync="model.f_write_card"
                       :options='writecard'
+                      :disabled="!applyButtonShow"
                       close-on-select clear-button></v-select>
           </div>
         </div>
@@ -37,7 +39,7 @@
         <div class="row" style="margin-top:10px;" v-if="model.f_reason[0] ==='其他'">
           <div class="col-sm-offset-2 col-sm-8" :class="[$v.f_othereason.required ? 'has-error' : '']">
             <label for="f_reason" class=" font_normal_body" >其他原因</label>
-            <input class="input_search" style="width:60%" v-validate:f_othereason='{required: true }' rows="3" v-model="model.f_othereason" placeholder="请填写补气原因">
+            <input class="input_search" style="width:60%" v-validate:f_othereason='{required: true }' rows="3" :readonly="!applyButtonShow" v-model="model.f_othereason" placeholder="请填写补气原因">
           </div>
         </div>
       </form>
@@ -237,6 +239,7 @@ export default {
     async apply () {
       this.addTaskModel.f_task_name = `用户：${this.row.f_user_name}，编号：${this.row.f_userinfo_code} 申请掉气补气`
       this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+      this.addTaskModel.f_memorandum = this.model.f_othereason
       this.addTaskModalShow = true
     },
     close () {

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -6,7 +6,7 @@
           <div class="row" v-if="isGas">
             <div class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
               <label class="font_normal_body">应补气量</label>
-              <input class="input_search" style="width:60%" type="number" @blur="pregas"
+              <input class="input_search" style="width:60%" type="number" @blur="pregas" :readonly="!applyButtonShow"
                      v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="应补气量" v-ref:f_pregas>
             </div>
             <div class="col-sm-4">
@@ -16,6 +16,7 @@
                         placeholder='请选择'
                         :value.sync="model.f_add_gas"
                         :options='addGas'
+                        :disabled="!applyButtonShow"
                         close-on-select clear-button>
               </v-select>
             </div>
@@ -25,6 +26,7 @@
                         v-model="model.f_write_card"
                         placeholder='是否写卡'
                         value-single
+                        :disabled="!applyButtonShow"
                         :value.sync="model.f_write_card"
                         :options='writecard'
                         close-on-select clear-button></v-select>
@@ -33,7 +35,7 @@
           <div class="row" v-if="!isGas">
             <div class="col-sm-4">
               <label for="f_preamount" class=" font_normal_body">应补金额:</label>
-              <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" placeholder="金额">
+              <input  class="input_search" style="width:60%" type="number" min = "0" v-model="model.f_preamount" :readonly="!applyButtonShow" placeholder="金额">
             </div>
             <div class="col-sm-4">
               <label for="f_add_gas" class="font_normal_body">是否入累计:</label>
@@ -41,13 +43,14 @@
                         placeholder='请选择'
                         :value.sync="model.f_add_gas"
                         :options='addGas'
+                        :disabled="!applyButtonShow"
                         close-on-select clear-button>
               </v-select>
             </div>
           </div>
           <div class="row" style="margin-top:10px;">
             <label for="f_reason" class=" font_normal_body">备&emsp;&emsp;注</label>
-              <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" placeholder="备注">
+              <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" :readonly="!applyButtonShow" placeholder="备注">
           </div>
         </form>
         <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
@@ -326,6 +329,7 @@
       async apply () {
         this.addTaskModel.f_task_name = `用户：${this.row.f_user_name},编号：${this.row.f_userinfo_code} 申请其他补气`
         this.addTaskModel.f_userinfo_code = this.row.f_userinfo_code
+        this.addTaskModel.f_memorandum = this.model.f_reason
         this.addTaskModalShow = true
       },
       accept () {

package/src/filiale/ancheng/FilesManage/FileUserFiles.vue

@@ -290,6 +290,16 @@
                     <input class="input_search" condition="f_meternumber ='{}'" placeholder='表号' style="width:60%"
                            type="text" v-model="model.f_meternumber">
                   </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group" >
+                    <label class="font_normal_body">表前阀状态</label>
+                    <v-select :options='$parent.$parent.bqfstates' :search='true'
+                              :value.sync="model.f_bqf_state"
+                              close-on-select
+                              condition="f_bqf_state = '{}'" placeholder='表前阀状态'
+                              v-model='model.f_bqf_state'></v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -341,6 +351,9 @@
                   <th >
                     <nobr>客户等级</nobr>
                   </th>
+                  <th  v-if="!$parent.$parent.$parent.createFile">
+                    <nobr>表前阀状态</nobr>
+                  </th>
                   <!--<th>-->
                   <!--<nobr v-if="this.$login.r.includes('通知单打印')||this.$login.r.includes('流程表打印') ">下载</nobr>-->
                   <!--</th>-->
@@ -370,6 +383,7 @@
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_user_state}}</td>
                 <td style="text-align: center;" >{{row.f_user_level}}</td>
+                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_bqf_state}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="button_search-2 button_spacing width-60"
                           v-if="row.f_user_state === '正常' || row.f_user_state==='预备'"
@@ -881,6 +895,9 @@ let loadParamGem = async function (self) {
       userstates () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
       },
+      bqfstates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('表前阀状态')]
+      },
       usegas () {
         return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
       },