lilei 3 years ago
parent
commit
aa685f02f8

+ 3 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -30,7 +30,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="info" style="margin-left: 5px" v-if="process.env.NODE_ENV!='production'" @click="taskIn" :disabled="disabled" >定时任务</a-button>
+                <a-button type="info" style="margin-left: 5px" v-if="isNotProd" @click="taskIn" :disabled="disabled" >定时任务</a-button>
                 <a-button type="primary" style="margin-left: 5px" @click="queryByTypeSum" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="replenishmentManagementList-reset">重置</a-button>
                 <a @click="advanced = !advanced" style="margin-left: 5px">
@@ -120,6 +120,7 @@ export default {
   mixins: [commonMixin],
   data () {
     return {
+      isNotProd: false,
       spinning: false,
       advanced: true, //  高级搜索 展开/关闭
       tableHeight: 0,
@@ -406,6 +407,7 @@ export default {
     },
     pageInit () {
       const _this = this
+      this.isNotProd = process.env.NODE_ENV != 'production'
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })

+ 20 - 1
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -216,6 +216,7 @@ import { STable, VSelect } from '@/components'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import { stockDetailProductList } from '@/api/sparePartsRet'
+import { warehouseAllList } from '@/api/warehouse'
 import {
   purchaseReturnDetailList,
   purchaseReturnDetailSave,
@@ -294,7 +295,8 @@ export default {
           this.dataSource = data.list
           return data
         })
-      }
+      },
+      warehouseList: [] // 仓库列表
     }
   },
   methods: {
@@ -457,6 +459,21 @@ export default {
         this.handleAdd(record, 'edit')
       }
     },
+    // 仓库
+    getWarehouse () {
+      warehouseAllList({}).then(res => {
+        if (res.status == 200) {
+          this.warehouseList = res.data
+        } else {
+          this.warehouseList = []
+        }
+      })
+    },
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
     // 获取详情
     getDetail (type) {
       purchaseReturnDetailSn({ sn: this.$route.params.sn }).then(res => {
@@ -470,6 +487,7 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.$refs.chooseTable.refresh(true)
+      this.getWarehouse()
       this.getDetail()
     }
   },
@@ -477,6 +495,7 @@ export default {
     // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
     if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
       this.$refs.chooseTable.refresh(true)
+      this.getWarehouse()
       this.getDetail()
     }
   },

+ 10 - 10
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -190,20 +190,20 @@ export default {
       tableHeight: 0,
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采退单号', scopedSlots: { customRender: 'purchaseReturnNo' }, width: '17%', align: 'center' },
-        { title: '供应商', dataIndex: 'returnTargetName', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalCategory', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总数量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '是否抓单', dataIndex: 'grabFlag', width: '14%', align: 'center', customRender: function (text) { return text == '1' ? '抓单' : '不抓单' } },
-        { title: '出库时间', dataIndex: 'outStockTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采退单号', scopedSlots: { customRender: 'purchaseReturnNo' }, width: '12%', align: 'center' },
+        { title: '供应商', dataIndex: 'returnTargetName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总金额', dataIndex: 'totalAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '是否抓单', dataIndex: 'grabFlag', width: '7%', align: 'center', customRender: function (text) { return text == '1' ? '抓单' : '不抓单' } },
+        { title: '出库时间', dataIndex: 'outStockTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
         { title: '出库', scopedSlots: { customRender: 'waitOut' }, width: '3%', align: 'center' },
         { title: '收款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
         // { title: '财务状态', dataIndex: 'settleStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {