瀏覽代碼

Merge commit '07b4e402d11fd9ffba94c91eddeef587000d3f71' into HEAD

gitadmin 1 年之前
父節點
當前提交
6905644545
共有 1 個文件被更改,包括 17 次插入5 次删除
  1. 17 5
      src/views/numsGoodsShelves/goodsShelvesAdministration/list.vue

+ 17 - 5
src/views/numsGoodsShelves/goodsShelvesAdministration/list.vue

@@ -57,13 +57,25 @@
         :defaultLoadData="false"
         bordered>
         <template slot="state" slot-scope="text, record">
-          <div @click="changeFlagHandle(record)" style="cursor:pointer;" id="goodsShelvesAdministrationList-changeFlagHandle">{{ record.stateDictValue }}<a-icon v-if="record.state!='CLOSE'" type="edit" title="编辑" :style="{color:' #1890FF',paddingLeft: '5px'}"/></div>
+          <div 
+           v-if="record.state!='WRITE_OFF'&&record.state!='DISABLED'"
+          @click="changeFlagHandle(record)" 
+          style="cursor:pointer;">
+          {{record.stateDictValue}}
+          <a-icon v-if="record.state!='CLOSE'" type="edit" title="编辑" :style="{color:' #1890FF',paddingLeft: '5px'}"/>
+          </div>
+          <div v-else>
+            {{ record.stateDictValue||(record.state=='WRITE_OFF'?'已注销':(record.state=='DISABLED'?'已停用':'')) }}
+          </div>
         </template>
         <template slot="action" slot-scope="text, record">
-          <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>
-          <!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
+          <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>
+            <!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
+          </div>
+          <span v-else>--</span>
         </template>
       </s-table>
     </a-spin>