chenrui 4 years ago
parent
commit
d46d314411

+ 2 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -120,7 +120,7 @@
         <span v-if="(record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'WAIT_OUT_WAREHOUSE')">--</span>
         <span v-if="(record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'WAIT_OUT_WAREHOUSE')">--</span>
       </template>
       </template>
     </s-table>
     </s-table>
-    <!-- 新增/编辑 -->
+    <!-- 新增 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
   </a-card>
 </template>
 </template>
@@ -262,7 +262,7 @@ export default {
     handleDetail (row) {
     handleDetail (row) {
       this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.storeCallOutSn}` })
       this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.storeCallOutSn}` })
     },
     },
-    //  新增/编辑
+    //  编辑
     handleEdit (row) {
     handleEdit (row) {
       this.$router.push({ path: `/allocationManagement/transferOut/edit/${row.id}/${row.storeCallOutSn}` })
       this.$router.push({ path: `/allocationManagement/transferOut/edit/${row.id}/${row.storeCallOutSn}` })
     },
     },

+ 11 - 8
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -34,7 +34,7 @@
     </div>
     </div>
     <!-- 操作按钮 -->
     <!-- 操作按钮 -->
     <div class="table-operator">
     <div class="table-operator">
-      <a-button id="promotionRulesList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+      <a-button id="promotionRulesList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
     </div>
     </div>
     <!-- 总计 -->
     <!-- 总计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
     <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -82,6 +82,8 @@
           id="promotionRulesList-detail-btn">详情</a-button>
           id="promotionRulesList-detail-btn">详情</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
+    <!-- 新增/编辑 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -91,8 +93,9 @@ import moment from 'moment'
 // import { dealerProductTypeList } from '@/api/dealerProductType'
 // import { dealerProductTypeList } from '@/api/dealerProductType'
 // import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
 // import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
 export default {
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, basicInfoModal },
   data () {
   data () {
     return {
     return {
       createDate: [], //  创建时间
       createDate: [], //  创建时间
@@ -159,13 +162,13 @@ export default {
       this.createDate = []
       this.createDate = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
-    //  新增/编辑
+    //  编辑
     handleEdit (row) {
     handleEdit (row) {
-      if (row) { //  编辑
-        this.$router.push({ path: `/promotionRulesManagement/promotionRules/edit/${row.id}` })
-      } else { //  新增
-        this.$router.push({ path: '/promotionRulesManagement/promotionRules/add' })
-      }
+      this.$router.push({ path: `/promotionRulesManagement/promotionRules/edit/${row.id}` })
+    },
+    //  基本信息  保存
+    handleOk (data) {
+      this.$router.push({ path: `/promotionRulesManagement/promotionRules/add/${data.id}/${data.storeCallOutSn}` })
     },
     },
     //  详情
     //  详情
     handleDetail (row) {
     handleDetail (row) {

+ 38 - 46
src/views/salesManagement/outboundOrder/list.vue

@@ -18,7 +18,7 @@
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
             <a-form-item label="客户名称">
-              <custList id="outboundOrderList-demanderName" v-model="queryParam.demanderName"></custList>
+              <a-input id="outboundOrderList-demanderName" v-model.trim="queryParam.demanderName" allowClear placeholder="请输入客户名称"/>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
@@ -34,13 +34,13 @@
           </a-col>
           </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
+              <a-form-item label="出库状态">
                 <v-select
                 <v-select
                   v-model="queryParam.state"
                   v-model="queryParam.state"
                   ref="state"
                   ref="state"
                   id="outboundOrderList-state"
                   id="outboundOrderList-state"
                   code="OUT_STATE"
                   code="OUT_STATE"
-                  placeholder="请选择单据状态"
+                  placeholder="请选择出库状态"
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
@@ -84,6 +84,10 @@
       :data="loadData"
       :data="loadData"
       :scroll="{ x: 1720, y: tableHeight }"
       :scroll="{ x: 1720, y: tableHeight }"
       bordered>
       bordered>
+      <!-- 单号 -->
+      <template slot="outBizNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.outBizNo }}</span>
+      </template>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
         <a-button
         <a-button
@@ -93,12 +97,6 @@
           class="button-primary"
           class="button-primary"
           @click="handleOutbound(record)"
           @click="handleOutbound(record)"
           id="outboundOrderList-out-btn">出库</a-button>
           id="outboundOrderList-out-btn">出库</a-button>
-        <a-button
-          size="small"
-          type="link"
-          class="button-success"
-          @click="handleDetail(record)"
-          id="outboundOrderList-detail-btn">详情</a-button>
       </template>
       </template>
     </s-table>
     </s-table>
   </a-card>
   </a-card>
@@ -107,16 +105,15 @@
 <script>
 <script>
 import moment from 'moment'
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
-import custList from '@/views/common/custList.js'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 export default {
 export default {
-  components: { STable, VSelect, custList },
+  components: { STable, VSelect },
   data () {
   data () {
     return {
     return {
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
       queryParam: { //  查询条件
-        demanderName: undefined, //  客户名称
+        demanderName: '', //  客户名称
         outBizType: undefined, //  出库类型
         outBizType: undefined, //  出库类型
         state: undefined //  状态
         state: undefined //  状态
       },
       },
@@ -126,16 +123,15 @@ export default {
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推单号', scopedSlots: { customRender: 'outBizNo' }, width: 220, align: 'center' },
+        { title: '单号', dataIndex: 'stockOutNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'demanderName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库时间', dataIndex: 'outTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       ],
       selectedRowKeys: [], // Check here to configure the default column
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,
       loading: false,
@@ -195,7 +191,7 @@ export default {
     },
     },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
-      this.queryParam.demanderName = undefined
+      this.queryParam.demanderName = ''
       this.queryParam.outBizType = undefined
       this.queryParam.outBizType = undefined
       this.queryParam.state = undefined
       this.queryParam.state = undefined
       this.time = []
       this.time = []
@@ -204,28 +200,28 @@ export default {
     //  详情
     //  详情
     handleDetail (row) {
     handleDetail (row) {
       //  根据出库类型跳转对应页面
       //  根据出库类型跳转对应页面
-      if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
-        this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SPARE_PARTS_RETURN') { // 散件退货
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SALES') { // 出库
-        this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'DISPATCH_DEDUCT') { // 急件冲减
-        this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SHOP_CALL_OUT') { // 店内调出
-        this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'CHECK_ORDER_OUT') { // 库存盘点盘亏
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'LINKAGE_CALL_OUT') { // 连锁调出
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'WAREHOUSE_CALL_OUT') { // 仓库调出
-        this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
-      } else {
-        this.$message.warning('出库类型未知')
-      }
+      // if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
+      //   this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SPARE_PARTS_RETURN') { // 散件退货
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SALES') { // 出库
+      //   this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'DISPATCH_DEDUCT') { // 急件冲减
+      //   this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SHOP_CALL_OUT') { // 店内调出
+      //   this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'CHECK_ORDER_OUT') { // 库存盘点盘亏
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'LINKAGE_CALL_OUT') { // 连锁调出
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'WAREHOUSE_CALL_OUT') { // 仓库调出
+      //   this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
+      // } else {
+      //   this.$message.warning('出库类型未知')
+      // }
     },
     },
     // 单个出库
     // 单个出库
     handleOutbound (row) {
     handleOutbound (row) {
@@ -261,10 +257,6 @@ export default {
       console.log('selectedRowKeys changed: ', selectedRowKeys)
       console.log('selectedRowKeys changed: ', selectedRowKeys)
       this.selectedRowKeys = selectedRowKeys
       this.selectedRowKeys = selectedRowKeys
     }
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-    })
   }
   }
 }
 }
 </script>
 </script>