lilei 1 рік тому
батько
коміт
7721d0c100

+ 1 - 1
public/version.json

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

+ 1 - 0
src/views/numsGoodsShelves/approveStore/list.vue

@@ -61,6 +61,7 @@
            {{record.storeName}}
            <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='WRITE_OFF'"></a-badge>
            <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='DISABLED'"></a-badge>
+           <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='SUSPEND'"></a-badge>
         </template>
         <!-- 图片 -->
         <template slot="imageUrl" slot-scope="text, record">

+ 5 - 2
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -53,6 +53,7 @@
         <template slot="shelfName" slot-scope="text, record">
            {{record.shelfName}}
            <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='WRITE_OFF'"></a-badge>
+           <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='SUSPEND'"></a-badge>
         </template>
         <!-- 货位数量 -->
         <template slot="shelfPlaceNum" slot-scope="text, record">
@@ -67,7 +68,8 @@
           <a-switch
             checkedChildren="是"
             unCheckedChildren="否"
-            v-if="record.finishFlag!=undefined&&record.state!='WRITE_OFF'&&record.state!='SUSPEND'"
+            :disabled="record.state=='WRITE_OFF'||record.state=='SUSPEND'"
+            v-if="record.finishFlag!=undefined"
             @change="changeStatus(record)"
             :checked="record.finishFlag == 1"
           />
@@ -80,7 +82,8 @@
           <a-switch
             checkedChildren="启用"
             unCheckedChildren="停用"
-            v-if="record.state!=undefined&&record.state!='WRITE_OFF'&&record.state!='SUSPEND'"
+            :disabled="record.state=='WRITE_OFF'||record.state=='SUSPEND'"
+            v-if="record.state!=undefined"
             @change="enableShelf(record)"
             :checked="record.state == 'ENABLE'"
           />

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ 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: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.117/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,