sale-client 3.6.18 → 3.6.20

package/package.json

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

package/src/App.vue

@@ -10,12 +10,8 @@
 </template>
 
 <script>
-import Vue from 'vue'
 
 export default {
-  ready () {
-    Vue.config.silent = true
-    Vue.mmType = 'AES'
-  }
+  ready () {}
 }
 </script>

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/FileUserFiles.vue

@@ -283,6 +283,13 @@
                     <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">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+                    <input class="input_search" condition="f_comments like '%{}%'" placeholder='备注' style="width:60%"
+                           type="text" v-model="model.f_comments">
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -331,6 +338,9 @@
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>状态</nobr>
                   </th>
+                  <th>
+                    <nobr>备注</nobr>
+                  </th>
                   <th >
                     <nobr>客户等级</nobr>
                   </th>
@@ -362,6 +372,7 @@
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <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_comments}}</td>
                 <td style="text-align: center;" >{{row.f_user_level}}</td>
                 <td style="text-align: center;">
                   <button type="button" name="button" class="button_search-2 button_spacing width-60"

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

package/src/components/revenue/base/leftview/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>