lilei 1 年之前
父节点
当前提交
7b3846d885
共有 3 个文件被更改,包括 6 次插入5 次删除
  1. 1 1
      public/version.json
  2. 1 1
      src/views/numsGoodsShelves/shelfSet/list.vue
  3. 4 3
      src/views/numsGoodsShelves/shelfSet/set.vue

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -94,7 +94,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <div>
-            <a-button size="small" type="link" class="button-primary" v-if="record.state!='SUSPEND'" @click="handleSet(record)">{{record.state!='WRITE_OFF'?'货架设置':'查看'}}</a-button>
+            <a-button size="small" type="link" class="button-primary" @click="handleSet(record)">{{record.state!='WRITE_OFF'&&record.state!='SUSPEND'?'货架设置':'查看'}}</a-button>
             <a-button size="small" type="link" class="button-primary" v-if="record.state!='WRITE_OFF'&&record.state!='SUSPEND'" @click="handleCancel(record)">注销</a-button>
           </div>
         </template>

+ 4 - 3
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -13,13 +13,14 @@
           <a-collapse-panel key="1">
             <template slot="header">
               <span>基础信息</span>
-              <a-button icon="edit" v-if="basicInfoData&&basicInfoData.state!='WRITE_OFF'" size="small" type="link" style="margin-left: 20px;color: #39f;" @click.stop="openInfoModal = true">编辑</a-button>
+              <a-button icon="edit" v-if="basicInfoData&&basicInfoData.state!='WRITE_OFF'&&basicInfoData.state!='SUSPEND'" size="small" type="link" style="margin-left: 20px;color: #39f;" @click.stop="openInfoModal = true">编辑</a-button>
             </template>
             <a-descriptions :column="2">
               <a-descriptions-item label="货架名称">
               {{ basicInfoData&&basicInfoData.shelfName || '--' }}
               <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="basicInfoData&&basicInfoData.state=='WRITE_OFF'"></a-badge>
               <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="basicInfoData&&basicInfoData.state=='DISABLED'"></a-badge>
+              <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="basicInfoData&&basicInfoData.state=='SUSPEND'"></a-badge>
               </a-descriptions-item>
               <a-descriptions-item>
                 <template slot="label">
@@ -80,7 +81,7 @@
           </a-form>
         </div>
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="basicInfoData&&basicInfoData.state!='WRITE_OFF'">
+        <div class="table-operator" v-if="basicInfoData&&basicInfoData.state!='WRITE_OFF'&&basicInfoData.state!='SUSPEND'">
           <a-button id="shelfSet-addHW" type="primary" class="button-error" @click="addHW(1)">新增货位</a-button>
           <a-button id="shelfSet-impoort" type="primary" class="button-info" @click="addHW(0)">批量导入货位</a-button>
           <a-button id="shelfSet-import" type="primary" class="button-error" @click="openGuideModal=true">导入绑定产品</a-button>
@@ -246,7 +247,7 @@ export default {
         { title: '最大库容', dataIndex: 'shelfProductApiEntity.maxQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '当前库存', dataIndex: 'shelfProductApiEntity.qty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
       ]
-      if(this.basicInfoData&&this.basicInfoData.state!='WRITE_OFF'){
+      if(this.basicInfoData&&this.basicInfoData.state!='WRITE_OFF'&&this.basicInfoData.state!='SUSPEND'){
         ret.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' })
       }
       return ret