lilei 2 년 전
부모
커밋
7ca5b19dfc

+ 1 - 1
public/version.json

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

+ 3 - 3
src/components/index.less

@@ -396,7 +396,7 @@
   }
   .ant-table-row{
     td{
-      > div:empty::after{
+      > div:not(.ant-table-row-expand-icon):empty::after{
         content: '--';
       }
       .ant-select-search__field__mirror{
@@ -408,7 +408,7 @@
     margin: 0;
     tr:hover{
       td{
-        > div:empty::after{
+        > div:not(.ant-table-row-expand-icon):empty::after{
           content: '--';
         }
       }
@@ -430,7 +430,7 @@
         }
       }
     }
-    td > div:empty{
+    td > div:not(.ant-table-row-expand-icon):empty{
       &::after{
         content:'--'
       }

+ 19 - 15
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -36,7 +36,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="info" style="margin-left: 5px" @click="openCreatRoModal=true" >生成补货单</a-button>
+                <!-- <a-button type="info" style="margin-left: 5px" @click="openCreatRoModal=true" >生成补货单</a-button> -->
                 <a-button type="primary" style="margin-left: 5px" @click="queryByTypeSum" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="replenishmentManagementList-reset">重置</a-button>
                 <a @click="advanced = !advanced" style="margin-left: 5px">
@@ -47,6 +47,11 @@
             </a-col>
           </a-row>
         </a-form>
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" class="button-error">待补货产品</a-button>
+          <span style="margin-left:10px;color:#999;">请点击此按钮,选择需要补货的产品创建补货单</span>
+        </div>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -76,7 +81,7 @@
         </a-table>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button>
+          <!-- <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button> -->
           <a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleOutWarehousing(record)">出库</a-button>
           <a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
           <a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>
@@ -148,11 +153,10 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '补货单号', dataIndex: 'replenishBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '补货单号', dataIndex: 'replenishBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, 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: 'totalConfirmQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '补货总量', dataIndex: 'totalConfirmQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '签收总量', dataIndex: 'totalPutQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '17%', align: 'left' }
       ],
@@ -184,17 +188,17 @@ export default {
       },
       subColumns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '货位号', dataIndex: 'product.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '32%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '补货应发总量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实发总量', dataIndex: 'confirmQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '签收总量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '补货数量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '签收数量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       listData: [],
       tabPaneData: [
         { bizName: '全部', bizType: 'ALL', countNum: 0 },
-        { bizName: '待确认', bizType: 'WAIT_CONFIRM', countNum: 0 },
+        // { bizName: '待确认', bizType: 'WAIT_CONFIRM', countNum: 0 },
         { bizName: '待出库', bizType: 'WAIT_OUT_STOCK', countNum: 0 },
         { bizName: '待签收', bizType: 'WAIT_CHECK', countNum: 0 },
         { bizName: '已完成', bizType: 'FINISH', countNum: 0 },
@@ -414,11 +418,11 @@ export default {
       this.spinning = true
       shelfReplenishStateCount(params).then(res => {
         if (res.data && res.status == 200) {
-          this.tabPaneData[1].countNum = res.data.WAIT_CONFIRM || 0
-          this.tabPaneData[2].countNum = res.data.WAIT_OUT_STOCK || 0
-          this.tabPaneData[3].countNum = res.data.WAIT_CHECK || 0
-          this.tabPaneData[4].countNum = res.data.FINISH || 0
-          this.tabPaneData[5].countNum = res.data.CANCEL || 0
+          // this.tabPaneData[1].countNum = res.data.WAIT_CONFIRM || 0
+          this.tabPaneData[1].countNum = res.data.WAIT_OUT_STOCK || 0
+          this.tabPaneData[2].countNum = res.data.WAIT_CHECK || 0
+          this.tabPaneData[3].countNum = res.data.FINISH || 0
+          this.tabPaneData[4].countNum = res.data.CANCEL || 0
           this.queryParam.bizType = this.curBizType
           this.$refs.table.refresh(!flag)
         }

+ 4 - 5
src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue

@@ -32,7 +32,7 @@
           </a-col> -->
           <a-col :md="24" :sm="24">
             <a-form-model-item label="出库备注">
-              <a-input id="replenishmentManagement-outWarehousing-remarks" :maxLength="30" v-model.trim="form.remarks" allowClear placeholder="请输入出库备注(最多30字符)"/>
+              <a-input id="replenishmentManagement-outWarehousing-remarks" :maxLength="100" v-model.trim="form.remarks" allowClear placeholder="请输入出库备注(最多100字符)"/>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -85,10 +85,9 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       columns: [
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
-        { title: '产品编码', dataIndex: 'product.code', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '32%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '补货应发数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实发数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品编码', dataIndex: 'product.code', width: '29%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '40%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '补货数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -88,8 +88,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '28%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '补货应发数量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '实发数量', dataIndex: 'confirmQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '补货数量', dataIndex: 'confirmQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '签收数量', scopedSlots: { customRender: 'putQty' }, width: '15%', align: 'center' },
         { title: '单位', dataIndex: 'product.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ],

+ 23 - 22
src/views/salesManagement/salesReturn/list.vue

@@ -91,28 +91,29 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-primary"
-            v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
-            @click="handleEexamine(record)"
-            id="salesReturn-eexamine-btn">审核</a-button>
-          <a-button
-            size="small"
-            v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnEdit')"
-            type="link"
-            class="button-primary"
-            @click="handleEdit(record,1)"
-            id="salesReturn-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnDel')"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-            id="salesReturn-del-btn">删除</a-button>
-          <span v-if="record.state == 'FINISH' || (!(record.state == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')) && !((record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnEdit')) && !((record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnDel')))">--</span>
+          <div>
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
+              @click="handleEexamine(record)"
+              id="salesReturn-eexamine-btn">审核</a-button>
+            <a-button
+              size="small"
+              v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnEdit')"
+              type="link"
+              class="button-primary"
+              @click="handleEdit(record,1)"
+              id="salesReturn-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnDel')"
+              type="link"
+              class="button-error"
+              @click="handleDel(record)"
+              id="salesReturn-del-btn">删除</a-button>
+          </div>
         </template>
       </s-table>
     </a-spin>