sale-client 3.5.1 → 3.5.2

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -437,7 +437,6 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button class="button_search button_spacing" type="button" @click="goChargeManage()">去收费</button>
         <button class="button_search button_spacing" type="button" @click="doCopy()">复制</button>
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
@@ -637,9 +636,6 @@ let loadParamGem = async function (self) {
         this.isShowDetailInfo = true
         this.rowData = obj
       },
-      goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
-      },
       async doCopy () {
         await this.$copyText(this.resdata)
         this.resshow = false

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -151,7 +151,6 @@
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>
-      <button class="button_search" type="button" @click="goChargeManage">去收费</button>
       <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
@@ -317,9 +316,6 @@
         uuidA = s.join('');
         return uuidA;
       },
-      goChargeManage () {
-        this.$goto('charge-manage', {f: this.$login.f}, 'main')
-      },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
           if (res === 'confirm') {

package/src/components/revenue/concentrator/ncArchivesList.vue

@@ -80,7 +80,7 @@
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_state}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_network}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_last_message_date}}</nobr></td>
-            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_new_message}}</nobr></td>
+            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_newmessage}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_user}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_date}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow" style="text-align:center"><nobr>{{row.sumuserfiles}}</nobr></td>

package/src/components/revenue/concentrator/ncUserfilesList2.vue

@@ -28,7 +28,6 @@
                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
                   <div class="span" style="float:right;">
-                    <button class="button_search button_spacing" @click="$parent.$parent.networking()">组网</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.meterRead()">抄表</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.confirmaddress()">取消关联</button>
                     <button class="button_search button_spacing" @click="search()">查询</button>
@@ -293,35 +292,6 @@ export default {
         this.search()
       }
     },
-    async networking () {
-      let res = await this.$showMessage('确定对选择的表具进行组网操作吗?', ['confirm', 'cancel'])
-      if (res === 'confirm') {
-        let rowdata = this.$refs.paged.$refs.grid.getRowData()
-        if (rowdata.length <= 0) {
-          this.$showMessage('请至少选择一个表具!')
-          return
-        }
-        console.log(rowdata)
-        let userfilesids = []
-        for (let row of rowdata) {
-          userfilesids.push({
-            f_userfiles_id: row.f_userfiles_id,
-            f_meternumber: row.f_meternumber
-          })
-        }
-        let param = {
-          f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.name,
-          concentratorid: this.fileinfo.id,
-          f_mpc_number: this.fileinfo.f_mpc_number,
-          userfilesid: '',
-          userfilesids: userfilesids,
-          state: 'delete'
-        }
-        await this.$resetpost('rs/logic/concentratorNetWorking', param, {resolveMsg: '组网操作成功!', rejectMsg: '组网操作失败!'})
-        this.search()
-      }
-    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },

package/src/main.js

@@ -7,7 +7,7 @@ import VueClipboard from 'vue-clipboard2'
 Vue.use(VueClipboard)
 Vue.config.silent = true
 // 新打包写法
-Vue.use(sale, {filiale: 'zhongsheng'})
+Vue.use(sale, {filiale: 'tongchuan'})
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')