Browse Source

采购修改

lilei 4 years ago
parent
commit
53837b4d85

+ 33 - 1
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -46,7 +46,39 @@
           <s-table
             class="sTable"
             ref="table"
-            size="default"
+            size="small"
+            :rowKey="(record) => record.id"
+            :columns="columns"
+            :data="loadData"
+            :scroll="{ x: 1060 }"
+            bordered>
+            <!-- 采购数量 -->
+            <template slot="purchaseNum" slot-scope="text, record">
+              <span>{{ record.purchaseNum }}</span>
+            </template>
+            <!-- 缺货数量 -->
+            <template slot="outOfStockNum" slot-scope="text, record">
+              <span>{{ record.outOfStockNum }}</span>
+            </template>
+          </s-table>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-card>
+    <!-- 促销品详情 -->
+    <a-card size="small" :bordered="false" class="purchaseOrderDetail-cont">
+      <a-collapse :activeKey="['1']">
+        <a-collapse-panel key="1" header="促销品详情">
+          <!-- 总计 -->
+          <a-alert type="info" showIcon style="margin-bottom:15px">
+            <div slot="message">产品款数 <strong>{{ detail&&detail.totalCategory }}</strong> ,
+              采购数量合计 <strong>{{ detail&&detail.totalQty }}</strong> ,
+              采购金额合计¥<strong>{{ detail&&detail.totalAmount }}</strong></div>
+          </a-alert>
+          <!-- 列表 -->
+          <s-table
+            class="sTable"
+            ref="table-1"
+            size="small"
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"

+ 4 - 0
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -182,6 +182,7 @@
           id="purchaseOrderEdit-submit-btn"
           size="large"
           class="button-primary"
+          :loading="subLoading"
           @click="handleSubmit"
           style="padding: 0 60px;">提交</a-button>
       </div>
@@ -205,6 +206,7 @@ export default {
     return {
       openModal: false, // 选择基本信息弹框是否显示
       detail: null, // 详细信息
+      subLoading: false,
       // 选择产品
       addLoading: false,
       productType: [],
@@ -388,6 +390,7 @@ export default {
     //  提交
     handleSubmit () {
       const _this = this
+      this.subLoading = true
       purchaseWriteSubmit({ id: this.detail.id }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
@@ -395,6 +398,7 @@ export default {
             _this.handleBack()
           }, 1000)
         }
+        _this.subLoading = false
       })
     },
     //  返回列表

+ 7 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -41,7 +41,13 @@
         </template>
       </s-table>
       <div style="text-align: center;">
-        <a-button type="primary" class="button-warning" :id="'purchaseOrderWarehousing-warehousing-'+bindex" @click="handleWarehousing(item,bindex)" >确认入库</a-button>
+        <a-button
+          type="primary"
+          class="button-warning"
+          :id="'purchaseOrderWarehousing-warehousing-'+bindex"
+          @click="handleWarehousing(item,bindex)"
+          v-if="item.auditState=='WAIT_PUT_WAREHOUSE'"
+        >确认入库</a-button>
       </div>
     </a-card>
   </div>

+ 1 - 0
src/views/salesManagement/salesQuery/queryPart.vue

@@ -265,6 +265,7 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].salesNums = 1
+            data.list[i].currentQty = data.list[i].currentQty || 0
           }
           this.disabled = false
           return data