Pārlūkot izejas kodu

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

lilei 4 gadi atpakaļ
vecāks
revīzija
14b8c61402

+ 12 - 19
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -24,20 +24,12 @@
               <a-row :gutter="15">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="产品编码" prop="productCode">
-                    <a-input
-                      id="warehouseAllocationEdit-productCode"
-                      v-model="queryParam.productCode"
-                      placeholder="请输入产品编码"
-                      allowClear />
+                    <a-input id="warehouseAllocationEdit-productCode" v-model="queryParam.productCode" placeholder="请输入产品编码" allowClear />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="产品名称" prop="productName">
-                    <a-input
-                      id="warehouseAllocationEdit-productName"
-                      v-model="queryParam.productName"
-                      placeholder="请输入产品名称"
-                      allowClear />
+                    <a-input id="warehouseAllocationEdit-productName" v-model="queryParam.productName" placeholder="请输入产品名称" allowClear />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -79,12 +71,12 @@
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="调出仓位" prop="outWarehouseLocationName">
+                    <a-form-item label="调出仓位" prop="warehouseLocationSn">
                       <a-select
-                        id="warehouseAllocationEdit-outWarehouseLocationName"
+                        id="warehouseAllocationEdit-warehouseLocationSn"
                         placeholder="请选择"
                         allowClear
-                        v-model="queryParam.outWarehouseLocationName"
+                        v-model="queryParam.warehouseLocationSn"
                         style="width: 100%;">
                         <a-select-option
                           v-for="item in warehouseOutLocData"
@@ -315,12 +307,12 @@ export default {
     return {
       typeName: [], // 分类
       queryParam: {
-        outWarehouseSn: '', // 调出仓库sn
+        warehouseSn: '', // 调出仓库sn
         productCode: '', // 产品编码
         productName: '', // 产品名称
         productOrigCode: '', // 原厂编码
         brandSn: undefined, // 品牌
-        outWarehouseLocationName: undefined // 调出仓位
+        warehouseLocationSn: undefined // 调出仓位
       },
       chooseParam: {
         allocationWarehouseSn: this.$route.params.sn, // 单据sn
@@ -373,7 +365,7 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center' },
-        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出仓位', dataIndex: 'warehouseLocationSn', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调入仓位', dataIndex: 'putWarehouseLocationSn', width: 140, align: 'center', scopedSlots: { customRender: 'storageQuantity' } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
@@ -403,7 +395,7 @@ export default {
       this.queryParam.productOrigCode = '' // 原厂编码
       this.queryParam.brandSn = undefined // 品牌
       this.typeName = [] // 分类
-      this.queryParam.outWarehouseLocationName = undefined // 调出仓位
+      this.queryParam.warehouseLocationSn = undefined // 调出仓位
       this.chooseParam.productCode = ''
       this.chooseParam.productName = ''
       this.pageNo = 1
@@ -416,7 +408,7 @@ export default {
       this.queryParam.productOrigCode = '' // 原厂编码
       this.queryParam.brandSn = undefined // 品牌
       this.typeName = [] // 分类
-      this.queryParam.outWarehouseLocationName = undefined // 调出仓位
+      this.queryParam.warehouseLocationSn = undefined // 调出仓位
       this.getProductList()
     },
 
@@ -453,7 +445,7 @@ export default {
       allocWarehouseFind({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.warehouse = res.data
-          this.queryParam.outWarehouseSn = res.data.outWarehouseSn
+          this.queryParam.warehouseSn = res.data.outWarehouseSn
           this.getProductList()
           this.getWarehouseLoc(this.warehouse.putWarehouseSn, 'put')
           this.getWarehouseLoc(this.warehouse.outWarehouseSn, 'out')
@@ -475,6 +467,7 @@ export default {
         params.productTypeSn2 = this.typeName[1] || ''
         params.productTypeSn3 = this.typeName[2] || ''
       }
+      console.log(params, '--------------------------------params')
       productQuery(params).then(res => {
         if (res.status == 200) {
           const data = res.data

+ 14 - 3
src/views/salesManagement/outboundOrder/list.vue

@@ -66,13 +66,14 @@
       </a-form>
     </div>
     <!-- 列表 -->
-    <div style="margin-bottom: 15px">
+    <!-- 暂不做 -->
+    <!-- <div style="margin-bottom: 15px">
       <a-button type="primary" id="outboundOrder-export" :disabled="!hasSelected" :loading="loading" @click="handleOutbounds">批量出库</a-button>
       <span style="margin-left: 8px">
         <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
       </span>
-    </div>
-    <s-table
+    </div> -->
+    <!-- <s-table
       class="sTable"
       ref="table"
       size="default"
@@ -82,6 +83,16 @@
       :data="loadData"
       :showPagination="false"
       :scroll="{ x: 1700 }"
+      bordered> -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :showPagination="false"
+      :scroll="{ x: 1700 }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">

+ 3 - 3
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -72,7 +72,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1180, y: 300 }"
+      :scroll="{ x: 1280, y: 300 }"
       bordered>
       <!-- 单号 -->
       <template slot="urgentBillNo" slot-scope="text, record">
@@ -104,8 +104,8 @@ export default {
       custAllList: [], //  客户下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 140, align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 200, align: 'center' },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },