Browse Source

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj07

lilei 2 years ago
parent
commit
e7a41a23e7

+ 105 - 8
src/views/numsGoodsShelves/recallManagement/addRecallBillModal.vue

@@ -7,7 +7,7 @@
     title="新增回调单--[数字货架]名吃环境啥的技术附件"
     v-model="isShow"
     @cancel="isShow = false"
-    :width="600">
+    width="60%">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="shelfSet-basicInfo-form"
@@ -16,13 +16,74 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
-        <a-form-model-item label="货架名称" prop="shelfName">
-          <shelfSList v-model="form.shelfName" @change="shelfChange"></shelfSList>
-        </a-form-model-item>
+        <a-row :gutter="16">
+          <a-col :span="8">
+            <a-form-model-item label="产品编码" prop="shelfName">
+              <a-input allowClear placeholder="请输入产品编码" v-model.tirm="form.productCode"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="产品名称">
+              <a-input allowClear placeholder="请输入产品名称" v-model.tirm="form.productName"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-model-item label="滞销天数">
+              <a-input-group>
+                <a-row>
+                  <a-col :span="11">
+                    <a-input-number
+                      id="shelfMonitoringList-minUnsalableDays"
+                      v-model="form.minUnsalableDays"
+                      :precision="0"
+                      :min="0"
+                      :max="999999"
+                      placeholder="起始天数"
+                      style="width: 100%;display: inline-block;" />
+                  </a-col>
+                  <a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
+                  <a-col :span="11">
+                    <a-input-number
+                      id="shelfMonitoringList-maxUnsalableDays"
+                      v-model="form.maxUnsalableDays"
+                      :precision="0"
+                      :min="0"
+                      :max="999999"
+                      placeholder="截止天数"
+                      style="width: 100%;display: inline-block;" />
+                  </a-col>
+                </a-row>
+              </a-input-group>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24" style="text-align: right;padding-right: 30px;">
+            <a-button type="primary" @click="getSumByType" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+          </a-col>
+        </a-row>
       </a-form-model>
-      <div class="btn-cont">
-        <a-button type="primary" id="importGuide-nextStep" @click="handlerNextStep">下一步</a-button>
-        <a-button id="shelfSet-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+      <div class="tableCon">
+        <div style="margin-bottom: 16px">
+          <a-button type="primary" :disabled="!hasSelected" :loading="loading" @click="start">
+            新增调回单
+          </a-button>
+          <span class="tableSpan">
+            <template v-if="hasSelected">
+              已选<span>{{ selectedRowKeys.length }}</span>款产品,共<span>10</span>件
+            </template>
+          </span>
+          <span>
+            <a-checkbox @change="onChange" size="small">
+              仅显示已选产品
+            </a-checkbox>
+          </span>
+        </div>
+        <a-table
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :columns="columns"
+          :data-source="data"
+        >
+        </a-table>
       </div>
     </a-spin>
   </a-modal>
@@ -64,8 +125,24 @@ export default {
         wrapperCol: { span: 17 }
       },
       form: {
-        shelfName: ''
+
       },
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '货位号', dataIndex: 'no', width: '15%', align: 'center' },
+        { title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '最大库容', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '补货在途', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '调回在途', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货架库存', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '滞销天数', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '调回数量', width: '15%', align: 'left', scopedSlots: { customRender: 'num' } }
+      ],
+      selectedRowKeys: [], // Check here to configure the default column
+      loading: false,
+      hasSelected: true,
       rules: {
         shelfName: [{ required: true, message: '请选择货架名称', trigger: 'change' }]
       },
@@ -73,6 +150,18 @@ export default {
     }
   },
   methods: {
+    start () {
+      this.loading = true
+      // ajax request after empty completing
+      setTimeout(() => {
+        this.loading = false
+        this.selectedRowKeys = []
+      }, 1000)
+    },
+    onSelectChange (selectedRowKeys) {
+      console.log('selectedRowKeys changed: ', selectedRowKeys)
+      this.selectedRowKeys = selectedRowKeys
+    },
     shelfChange (v, row) {
       this.shelfName = row ? row.shelfName : ''
     },
@@ -172,5 +261,13 @@ export default {
 		text-align: center;
 		margin: 35px 0 10px;
 	}
+  .tableSpan{
+    margin:0 16px;
+    span{
+      margin: 0 10px;
+      color:red;
+      font-weight: bold;
+    }
+  }
 }
 </style>

+ 71 - 4
src/views/numsGoodsShelves/recallManagement/detailModal.vue

@@ -45,10 +45,28 @@
     </div>
     <div class="btn-cont"><a-button id="vinRecord-modal-back" @click="isShow = false">关闭</a-button></div>
     <!-- 回调单号提示窗 -->
-    <a-modal v-model="tipVisible" @ok="handleOk">
-      <p>内容</p>
-      <p>Some contents...</p>
-      <p>Some contents...</p>
+    <a-modal
+      class="tipPopup"
+      :maskClosable="false"
+      v-model="tipVisible"
+      :centered="true"
+      :closable="false"
+      :footer="null"
+      width="23%">
+      <div class="tipTop">
+        <div>产品总款数:<span>5</span></div>
+        <div>产品总件数:<span>5</span></div>
+      </div>
+      <div class="tipCon">确认生成销售退货订单吗?</div>
+      <div class="tipCon">此调货单已经存在相应的销售退货单,确定再次生成销售退货单吗?</div>
+      <div class="tipRecallBillNo">
+        <p>DH221104000008</p>
+        <p>DH221104000008</p>
+      </div>
+      <div class="tipFooter">
+        <div class="btnLeft" @click="tipVisible = false">取消</div>
+        <div class="btnLeft">确定</div>
+      </div>
     </a-modal>
   </a-modal>
 </template>
@@ -133,4 +151,53 @@ export default {
       }
     }
   }
+  // 弹窗
+  .tipPopup{
+    .ant-modal-body{
+      padding:0 !important;
+    }
+    text-align: center;
+    .tipTop{
+      width:62%;
+      display: flex;
+      algin-item:center;
+      padding:20px 0;
+      box-sizing: border-box;
+      justify-content: space-between;
+      color:#333;
+      margin:0 auto;
+      span{
+        color:#f30f3;
+        font-weight: bold;
+      }
+    }
+    .tipCon{
+        width:62%;
+        margin: 0 auto 30px;
+        text-align: center;
+    }
+    .tipRecallBillNo{
+        padding:20px;
+        p{
+          padding-bottom: 15px;
+          border-bottom: 1px solid #e0e0e0;
+        }
+    }
+    .tipFooter{
+      display: flex;
+      algin-item:center;
+      border-top:1px solid #e0e0e0;
+      .btnLeft{
+        width:50%;
+        text-align: center;
+        height:46px;
+        line-height: 46px;
+        color:#39f;
+        &:first-child{
+          border-right:1px solid #e0e0e0;
+        }
+      }
+    }
+
+  }
 </style>