lilei 1 年之前
父节点
当前提交
916ddceaf0

+ 1 - 1
public/version.json

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

+ 4 - 1
src/views/common/shelfList.js

@@ -14,7 +14,10 @@ const shelfSList = {
         option-filter-prop="children"
         :dropdownMatchSelectWidth="false"
         :filter-option="filterOption">
-        <a-select-option v-for="item in shelfList" :key="item.shelfSn" :value="item.shelfSn">{{ item.shelfName }}</a-select-option>
+        <a-select-option v-for="item in shelfList" :key="item.shelfSn" :value="item.shelfSn">
+        {{ item.shelfName }} 
+        <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#666',background:'#f8f8f8' }" v-if="item.state=='WRITE_OFF'"></a-badge>
+        </a-select-option>
       </a-select>
     `,
   props: {

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

@@ -33,7 +33,7 @@
                   {{ item.salesBillNo }};
                 </a>
                 <span v-if="salesOrderList.length==0">--</span>
-                <a-button v-if="totalNums&&detailData.billState!='CANCEL'" type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
+                <a-button v-if="totalNums&&detailData.billState!='CANCEL'&&detailData.shelfInfo.state!='WRITE_OFF'&&detailData.shelfInfo.state!='SUSPEND'" type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
               </div>
             </a-descriptions-item>
           </a-descriptions>

+ 9 - 2
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -31,7 +31,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfSList v-model="queryParam.shelfSn"></shelfSList>
+                <shelfSList :showAll="true" v-model="queryParam.shelfSn"></shelfSList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -97,6 +97,13 @@
           <a-button v-if="record.billState=='CANCEL'" size="small" type="link" class="button-error" @click.stop="handleDelete(record)">删除</a-button>
           <a-button v-if="record.billState!='CANCEL'&&record.billState!='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
         </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>
+          <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.shelfInfo.state=='SUSPEND'"></a-badge>
+        </template>
         <!-- 补货单号 -->
         <template slot="replenishBillNo" slot-scope="text, record">
           <span class="table-td-link" @click.stop="handleDetail(record)">{{ record.replenishBillNo }}</span>
@@ -239,7 +246,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '补货单号', dataIndex: 'replenishBillNo', scopedSlots: { customRender: 'replenishBillNo' }, width: '15%', 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: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '补货总量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '签收总量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

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

@@ -41,7 +41,8 @@
             :showPagination="false"
             bordered>
             <template slot="shelfName" slot-scope="text, record">
-              {{ text }}<span style="color:#ff5500;margin-left:5px;" v-if="record.state!=='ENABLE'">(状态为“已暂停”)</span>
+              {{ text }}
+              <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state!=='ENABLE'"></a-badge>
             </template>
             <template slot="action" slot-scope="text, record">
               <span class="table-td-link" @click.stop="handleDetail(record)">产品明细</span>