lilei пре 2 година
родитељ
комит
88623149ff

+ 1 - 1
public/version.json

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

+ 43 - 6
src/views/numsGoodsShelves/replenishmentManagement/detailModal.vue

@@ -20,7 +20,7 @@
             <a-descriptions-item label="签收时间">{{ detailData&&detailData.putStockTime || '--' }}</a-descriptions-item>
             <a-descriptions-item label="出库备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
             <a-descriptions-item label="关联销售单" :span="3" v-if="detailData.billState=='WAIT_CHECK' || detailData.billState=='WAIT_OUT_STOCK' || detailData.billState=='FINISH'">
-              <a-button type="link" class="button-info" v-for="item in salesOrderList" :key="item.id">{{ item.orderNo }};</a-button>
+              <a style="margin-right:10px;color:#00aaff;" v-for="item in salesOrderList" :key="item.id" @click="viewSales(item)">{{ item.salesBillNo }};</a>
               <a-button type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
             </a-descriptions-item>
           </a-descriptions>
@@ -47,15 +47,20 @@
     <!-- 生成销售单 -->
     <commonModal modalTit="" :openModal="showPlModal" @close="showPlModal=false" @ok="createSales">
       <div style="display: flex;justify-content: center;margin-bottom: 15px;">
-        <div style="padding:5px 20px;">产品款数:<span style="color:red;">9</span></div>
-        <div style="padding:5px 20px;">产品总件数:<span style="color:red;">12</span></div>
+        <div style="padding:5px 20px;">产品款数:<span style="color:red;">{{ listData&&listData.length }}</span></div>
+        <div style="padding:5px 20px;">产品总件数:<span style="color:red;">{{ totalNums }}</span></div>
       </div>
       <div style="text-align: center;" v-if="salesOrderList.length">
         <div style="margin-bottom: 5px;font-size: 14px;">此补货单已经存在对应的销售单</div>
         <div style="margin-bottom: 15px;font-size: 14px;"><strong>确认再次生成销售单吗?</strong></div>
         <div style="line-height: 24px;">
-          <div style="padding:5px;border-bottom: 1px solid #eee;color:#00aaff;display: flex;justify-content: space-between;align-items: center;" v-for="item in salesOrderList" :key="item.id">
-            <div class="flex-grow:1;padding:0 5px;">{{ item.orderNo }};</div>
+          <div
+            style="padding:5px;border-bottom: 1px solid #eee;color:#00aaff;cursor: pointer;display: flex;justify-content: space-between;align-items: center;"
+            v-for="item in salesOrderList"
+            :key="item.id"
+            @click="viewSales(item)"
+          >
+            <div class="flex-grow:1;padding:0 5px;">{{ item.salesBillNo }};</div>
             <div class="padding:0 5px;"><a-icon type="right" style="color:#00aaff;" /></div>
           </div>
         </div>
@@ -64,6 +69,21 @@
         <div style="margin-bottom: 15px;font-size: 14px;"><strong>确认生成销售单吗?</strong></div>
       </div>
     </commonModal>
+    <!-- 销售单详情 -->
+    <a-modal
+      centered
+      class="outboundOrderDetail-modal"
+      :footer="null"
+      :maskClosable="false"
+      :bodyStyle="{padding:'12px'}"
+      title="销售单详情"
+      v-model="openDetailModal"
+      @cancel="openDetailModal=false"
+      width="80%">
+      <div style="max-height: 700px;overflow-y: auto;">
+        <salesDetailModal :outBizSn="orderSn" />
+      </div>
+    </a-modal>
   </a-modal>
 </template>
 
@@ -71,10 +91,11 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import commonModal from '@/views/common/commonModal.vue'
+import salesDetailModal from '@/views/salesManagement/salesQuery/detail.vue'
 import { shelfReplenishDetailList, shelfReplenishDetail, queryRelationSalesBill, createSalesBill } from '@/api/shelfReplenish'
 export default {
   name: 'DetailModal',
-  components: { STable, VSelect, commonModal },
+  components: { STable, VSelect, commonModal, salesDetailModal },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -94,6 +115,9 @@ export default {
       spinning: false,
       disabled: false,
       showPlModal: false,
+      openDetailModal: false,
+      orderSn: null,
+      listData: [],
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -130,6 +154,13 @@ export default {
     modalTit () {
       const hjName = this.nowData && this.nowData.shelfInfo.shelfName ? this.nowData.shelfInfo.shelfName : ''
       return '补货单详情 —— ' + hjName
+    },
+    totalNums () {
+      let ret = 0
+      this.listData.map(item => {
+        ret = ret + item.putQty
+      })
+      return ret
     }
   },
   methods: {
@@ -156,6 +187,7 @@ export default {
     // 生成销售单
     createSales () {
       this.spinning = true
+      this.showPlModal = false
       createSalesBill({ replenishBillSn: this.nowData.replenishBillSn }).then(res => {
         if (res.status == 200) {
           this.$message.info(res.message)
@@ -164,6 +196,11 @@ export default {
         this.spinning = false
       })
     },
+    // 查看销售单详情
+    viewSales (item) {
+      this.orderSn = item.salesBillSn
+      this.openDetailModal = true
+    },
     pageInit () {
       const vm = this
       vm.$nextTick(() => {

+ 1 - 1
vue.config.js

@@ -211,7 +211,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.215:8503/qpls-md',
+        target: 'http://192.168.0.182:8503/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,