Kaynağa Gözat

Merge branch 'develop_yh32' of jianguan-web/jq-repairFusion-html into pre-release

李磊 1 yıl önce
ebeveyn
işleme
07b4e402d1

+ 4 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/list.vue

@@ -58,18 +58,18 @@
         bordered>
         <template slot="state" slot-scope="text, record">
           <div 
-           v-if="record.state!='WRITE_OFF'"
+           v-if="record.state!='WRITE_OFF'&&record.state!='DISABLED'"
           @click="changeFlagHandle(record)" 
           style="cursor:pointer;">
-          {{ record.stateDictValue }}
+          {{record.stateDictValue}}
           <a-icon v-if="record.state!='CLOSE'" type="edit" title="编辑" :style="{color:' #1890FF',paddingLeft: '5px'}"/>
           </div>
           <div v-else>
-            {{record.stateDictValue}}
+            {{ record.stateDictValue||(record.state=='WRITE_OFF'?'已注销':(record.state=='DISABLED'?'已停用':'')) }}
           </div>
         </template>
         <template slot="action" slot-scope="text, record">
-          <div v-if="record.state!='WRITE_OFF'">
+          <div v-if="record.state!='WRITE_OFF'&&record.state!='DISABLED'">
             <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="goodsShelvesAdministrationList-handleEdit">编辑</a-button>
             <a-button size="small" type="link" class="button-info" @click="handleSet(record)" id="goodsShelvesAdministrationList-handleSet">货位设置</a-button>
             <a-button size="small" type="link" class="button-info" @click="handleSettlement(record)" id="goodsShelvesAdministrationList-handleSettlement">结算设置</a-button>