lilei 1 year ago
parent
commit
b0f80b2199

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/detailModal.vue

@@ -23,7 +23,7 @@
           <span v-else>
             --
           </span>
-          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL' && !isZero">生成销售退货单</a-button>
+          <a-button type="primary" ghost class="recallBillBtn" @click="seeRecallBill" v-if="itemData.billState != 'CANCEL' && !isZero &&itemData.shelfInfo.state!='WRITE_OFF'&&itemData.shelfInfo.state!='SUSPEND'">生成销售退货单</a-button>
         </a-descriptions-item>
       </a-descriptions>
     </div>

+ 8 - 2
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -22,7 +22,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfList v-model="queryParam.shelfSn"></shelfList>
+                <shelfList :showAll="true" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -68,6 +68,12 @@
             {{ record.recallBillNo || '--' }}
           </div>
         </template>
+        <!-- 货架名称 -->
+        <template slot="shelfName" slot-scope="text, record">
+          {{text}}
+          <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.shelfInfo.state=='WRITE_OFF'"></a-badge>
+          <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.shelfInfo.state=='DISABLED'"></a-badge>
+        </template>
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
@@ -157,7 +163,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回单号', scopedSlots: { customRender: 'recallBillNo' }, width: '20%', align: 'center' },
-        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '货架名称', dataIndex: 'shelfInfo.shelfName',scopedSlots: { customRender: 'shelfName' }, width: '25%', align: 'left', ellipsis: true },
         { title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/slodOutModal.vue

@@ -42,7 +42,8 @@
             bordered>
             <template slot="shelfName" slot-scope="text, record">
               {{ text }}
-              <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state!=='ENABLE'"></a-badge>
+              <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='SUSPEND'"></a-badge>
+              <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='DISABLED'"></a-badge>
             </template>
             <template slot="action" slot-scope="text, record">
               <span class="table-td-link" @click.stop="handleDetail(record)">产品明细</span>