浏览代码

bug修复

chenrui 4 年之前
父节点
当前提交
2a9dcfb628

+ 2 - 2
src/views/dealerManagement/merchantInfoManagement/updateCooperate.vue

@@ -56,7 +56,7 @@ export default {
     return {
       isShow: this.openUcModal, //  是否打开弹框
       title: '合作设置',
-      dateFormat: 'YYYY-MM-DD hh:mm:ss',
+      dateFormat: 'YYYY-MM-DD',
       labelCol: { span: 5 },
       wrapperCol: { span: 16 },
       other: '',
@@ -90,7 +90,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(this.form))
-          params.cooperateEffectiveTime = moment(params.cooperateEffectiveTime).format('YYYY-MM-DD hh:mm:ss')
+          params.cooperateEffectiveTime = moment(params.cooperateEffectiveTime).format('YYYY-MM-DD') + ' 00:00:00'
           updateCooperate(params).then(res => {
             if (res.status == 200) {
               this.$message.success(res.message)

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

@@ -60,7 +60,6 @@
       </a-form>
     </div>
     <!-- 列表 -->
-    <!-- 暂不做 -->
     <div style="margin-bottom: 15px">
       <a-button type="primary" id="outboundOrder-export" :loading="loading" @click="handleOutbound()">批量出库</a-button>
       <span style="margin-left: 8px">
@@ -75,7 +74,7 @@
       :rowKey="(record) => record.stockOutSn"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1710, y: tableHeight }"
+      :scroll="{ x: 1760, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="stockOutNo" slot-scope="text, record">
@@ -118,7 +117,8 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库单号', scopedSlots: { customRender: 'stockOutNo' }, width: 220, align: 'center' },
         { title: '业务单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },