lilei 1 year ago
parent
commit
bfd9bb74c3
3 changed files with 30 additions and 15 deletions
  1. 1 1
      public/version.json
  2. 28 13
      src/views/numsGoodsShelves/shelfSet/list.vue
  3. 1 1
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1706584249308
+  "version": 1706600342074
 }

+ 28 - 13
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -102,6 +102,25 @@
     </a-spin>
     <!-- 基础设置 -->
     <basic-info-modal :type="0" :openModal="openModal" :nowData="nowData" @ok="handleOk" @close="openModal=false" />
+    <a-modal
+      centered
+      class="common-modal"
+      :footer="null"
+      :maskClosable="false"
+      v-model="showTip"
+      title="注销"
+      @cancel="showTip=false"
+      :width="416">
+      <div style="text-align:center;">
+        <div style="font-size:16px;">是否注销该数字货架?</div>
+        <div style="font-size:14px;">点击确定,该数字货架就不可做任何操作,用户不可登陆</div>
+        <div style="font-size:12px;color:#999;margin-top:10px;">如需要迁移该数字货架的数据,可去货架设置中导出货架信息</div>
+      </div>
+      <div class="btn-box" style="display: flex;align-items: center;justify-content: center;margin-top:25px;">
+        <a-button type="primary" @click="handleCommonOk">确定</a-button>
+        <a-button type="default" class="button-warning" @click="showTip=false">取消</a-button>
+      </div>
+    </a-modal>
   </a-card>
 </template>
 
@@ -111,15 +130,17 @@ import { STable, VSelect } from '@/components'
 import custList from '@/views/common/custList.vue'
 import shelfSList from '@/views/common/shelfList'
 import basicInfoModal from './basicInfoModal.vue'
+import commonModal from '@/views/common/commonModal.vue'
 import { shelfList, modifFinishFlag, shelfModifState } from '@/api/shelf'
 export default {
-  components: { STable, VSelect, custList, shelfSList, basicInfoModal },
+  components: { STable, VSelect, custList, shelfSList, basicInfoModal, commonModal },
   mixins: [commonMixin],
   data () {
     return {
       spinning: false,
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
+      showTip: false,
       queryParam: {
         shelfSn: undefined,
         customerSn: undefined,
@@ -222,21 +243,14 @@ export default {
     },
     // 注销
     handleCancel(record){
-      const params = {
+      this.nowData = {
         shelfSn: record.shelfSn,
         state: 'WRITE_OFF'
       }
-      const _this = this
-      _this.$confirm({
-        title: '',
-        content: <div style="text-align:center;"><div style="font-size:14px;">是否注销该数字货架,</div><div>点击确定,该数字货架就不可做任何操作,用户不可登陆</div><div style="font-size:12px;color:#999;margin-top:10px;">如需要迁移该数字货架的数据,可去货架设置中导出货架信息</div></div>,
-        centered: true,
-        closable: true,
-        class: 'confirm-center',
-        onOk () {
-           _this.updateState(params)
-        }
-      })
+      this.showTip = true
+    },
+    handleCommonOk(){
+      this.updateState(this.nowData)
     },
     updateState(params){
       this.spinning = true
@@ -248,6 +262,7 @@ export default {
         } else {
           this.spinning = false
         }
+        this.showTip = false
       })
     },
     // 重置

+ 1 - 1
vue.config.js

@@ -209,7 +209,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.117/qpls-md',
+        // target: 'http://192.168.2.103/qpls-md',
         target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,