apply-clients 4.1.44-weinan → 4.1.46-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.44-weinan",
+  "version": "4.1.46-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppdevicesDetails.vue

@@ -245,8 +245,8 @@
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
-                :value.sync="item.f_state"
-                v-model="item.f_state"
+                :value.sync="item.f_userinfodevices_state"
+                v-model="item.f_userinfodevices_state"
                 :options="aroundmeters"
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
@@ -257,8 +257,8 @@
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
-                :value.sync="item.WatchPurchase"
-                v-model="item.WatchPurchase"
+                :value.sync="item.watchpurchase"
+                v-model="item.watchpurchase"
                 :options="positions"
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
@@ -629,6 +629,7 @@ export default {
         userinfo: this.userinfo,
         selectdata: this.selectdata
       }
+      data.userinfo.devices[0].f_state = '有效'
       let res = await this.$resetpost(this.$androidUtil.getProxyUrl() +'/rs/logic/addInstallationDetailsDevices', {data:data}, {
         resolveMsg: null,
         rejectMsg: '设备添加失败！！！'
@@ -821,7 +822,7 @@ export default {
     },
     // 表向
     aroundmeters() {
-      return this.$appdata.getParam('设备状态')
+      return this.$appdata.getParam('用户设备状态')
     },
     // 安装位置
     positions() {

package/src/components/product/Process/Processes/devicesDetails.vue

@@ -243,8 +243,8 @@
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
-                :value.sync="item.f_state"
-                v-model="item.f_state"
+                :value.sync="item.f_userinfodevices_state"
+                v-model="item.f_userinfodevices_state"
                 :options="aroundmeters"
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
@@ -255,8 +255,8 @@
             <div class="col-sm-8">
               <input-select
                 class="select select_list"
-                :value.sync="item.WatchPurchase"
-                v-model="item.WatchPurchase"
+                :value.sync="item.watchpurchase"
+                v-model="item.watchpurchase"
                 :options="positions"
                 :disable="mark === 1"
                 :valueSingle="true"></input-select>
@@ -629,6 +629,7 @@ export default {
         userinfo: this.userinfo,
         selectdata: this.selectdata
       }
+      data.userinfo.devices[0].f_state = '有效'
       let res = await this.$resetpost('rs/logic/addInstallationDetailsDevices', {data:data}, {
         resolveMsg: null,
         rejectMsg: '设备添加失败！！！'
@@ -800,7 +801,7 @@ export default {
     },
     // 表向
     aroundmeters() {
-      return this.$appdata.getParam('设备状态')
+      return this.$appdata.getParam('用户设备状态')
     },
     // 安装位置
     positions() {

package/src/components/product/Stop/StopApplyList.vue

@@ -135,9 +135,9 @@
             <th style="white-space: nowrap;">终止原因</th>
             <th style="white-space: nowrap;">终止时间</th>
             <th style="white-space: nowrap;">终止人</th>
-            <th style="white-space: nowrap;">撤销原因</th>
-            <th style="white-space: nowrap;">撤销时间</th>
-            <th style="white-space: nowrap;">撤销人</th>
+            <th style="white-space: nowrap;">启用原因</th>
+            <th style="white-space: nowrap;">启用时间</th>
+            <th style="white-space: nowrap;">启用人</th>
             <th style="white-space: nowrap;">操作</th>
           </tr>
         </template>
@@ -189,7 +189,7 @@
                 </button>
                 <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
                   <li>
-                    <a href="#" @click="$parent.$parent.$parent.click(row)">撤销</a>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">重新启用</a>
                   </li>
                 </ul>
               </dropdown>