lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
1d15e0ec2f

+ 1 - 1
public/version.json

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

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

@@ -26,7 +26,6 @@
             <a-descriptions-item label="关联销售单" :span="3" v-if="detailData.billState=='WAIT_CHECK' || detailData.billState=='WAIT_OUT_STOCK' || detailData.billState=='FINISH'">
               <div style="word-break: break-all;">
                 <a
-                  v-if="totalNums"
                   style="margin-right:10px;color:#00aaff;"
                   v-for="item in salesOrderList"
                   :key="item.id"

+ 2 - 2
src/views/numsGoodsShelves/replenishmentManagement/printStickerModal.vue

@@ -20,7 +20,7 @@
         size="small"
         :rowKey="(record) => record.id"
         rowKeyName="id"
-        :row-selection="{ columnWidth: 40 }"
+        :row-selection="!(basicInfoData.billState == 'FINISH' && !basicInfoData.totalPutQty)?{columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: !record.printQty} })}:null"
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
@@ -44,7 +44,7 @@
         </template>
       </s-table>
       <div class="btn-cont">
-        <a-button type="primary" id="replenishmentManagement-printSticker-modal-save" @click="handleSave">开始打印</a-button>
+        <a-button v-if="!(basicInfoData && basicInfoData.billState == 'FINISH' && !basicInfoData.totalPutQty)" type="primary" id="replenishmentManagement-printSticker-modal-save" @click="handleSave">开始打印</a-button>
         <a-button id="replenishmentManagement-printSticker-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </a-spin>

+ 14 - 1
src/views/salesManagement/salesQuery/chooseShelfProduct.vue

@@ -68,6 +68,7 @@
               @rowSelection="rowSelectionFun"
               :columns="columns"
               :data="loadData"
+              :style="{ height: '500px' }"
               :scroll="{ y: 450 }"
               :showPagination="false"
               bordered>
@@ -161,6 +162,7 @@
               :rowKey="(record) => record.id"
               :columns="columns1"
               :data="loadData1"
+              :style="{ height: '500px' }"
               :scroll="{ y: 450 }"
               :showPagination="false"
               bordered>
@@ -336,6 +338,17 @@ export default {
     },
     // 添加
     handleAdd (row) {
+      const clist = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows || []
+      const blist = this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys || []
+      const i = clist.findIndex(item => item.id == row.id)
+      const k = blist.findIndex(item => item == row.id)
+      console.log(i, k)
+      if (i >= 0) {
+        clist.splice(i, 1)
+      }
+      if (k >= 0) {
+        blist.splice(k, 1)
+      }
       this.$emit('add', row)
     },
     // 批量添加
@@ -359,7 +372,7 @@ export default {
       this.$refs.table.refresh(true)
     },
     reload () {
-      this.$refs.table.clearSelected()
+      // this.$refs.table.clearSelected()
       this.$refs.table.refresh()
     },
     // ---------- 全部产品----------