Merge branch 'master' of http://git.cc-lotus.info/news-zhwl/cms-zhwl into master

src/views/car/daily.vue

@@ -52,12 +52,14 @@ export default {
         {
           label: '编辑',
           method: 'edit',
+          display: i => i.status === '0',
         },
         {
           label: '删除',
           confirm: true,
           type: 'danger',
           method: 'delete',
+          display: i => i.status === '0',
         },
       ],
       fields: [

src/views/car/once.vue

@@ -111,7 +111,7 @@ export default {
     this.getOhterList();
   },
   methods: {
-    ...transport(['query', 'update', 'calculate']),
+    ...transport(['query', 'update', 'calculate', 'export']),
     ...car({ getCarList: 'query' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, limit, ...info, supply_type: '0' });
@@ -157,10 +157,14 @@ export default {
     /**
      * 获取合计
      */
-    toExport() {
-      // TODO 导出excel
+    async toExport() {
       let msg = this.$message({ message: '正在导出,请稍后', duration: 0 });
-      console.log('in function:toExport');
+      const ids = this.selected.map(i => i._id);
+      const res = await this.export({ type: 'once', ids });
+      if (this.$checkRes(res)) {
+        msg.close();
+        window.open(res);
+      }
     },
     toReturn() {
       this.dialog = false;

src/views/car/out.vue

@@ -119,9 +119,13 @@ export default {
     },
     // 导出
     async toExport() {
+      let msg = this.$message({ message: '正在导出,请稍后', duration: 0 });
       const dup = this.setQuery();
       const res = await this.export({ ...dup, type: 'car' });
-      console.log(res);
+      if (this.$checkRes(res)) {
+        msg.close();
+        window.open(res);
+      }
     },
     // 校验数据
     toSearch(type) {

src/views/order/inDetail.vue

@@ -7,7 +7,7 @@
           <span>收入详情</span>
         </el-col>
         <el-col :span="24" class="rate">
-          <el-col :span="24" class="tip"><span>关于长途运费:若是改成 他运且想根据设置的不同方式进行计算 需要重新生成订单,目前还无法处理这种情况</span></el-col>
+          <!-- <el-col :span="24" class="tip"><span>关于长途运费:若是改成 他运且想根据设置的不同方式进行计算 需要重新生成订单,目前还无法处理这种情况</span></el-col> -->
           <el-col :span="6" class="rateMoney">税前应收:{{ cost1 }}</el-col>
           <el-col :span="6" class="rateMoney">税后应收:{{ cost2 }}</el-col>
           <el-col :span="6" class="rateMoney">税前实收:{{ cost3 }}</el-col>

src/views/order/index-parts/form.vue

@@ -26,7 +26,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="要求发货日期">
-            <el-date-picker v-model="form.rq_send_time" type="date" placeholder="选择择要求发货日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+            <el-date-picker v-model="form.rq_send_time" type="date" placeholder="选择要求发货日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发货日期">
@@ -34,7 +34,7 @@
             {{ getListLast('send_time') }}
           </el-form-item>
           <el-form-item label="要求到达日期">
-            <el-date-picker v-model="form.rq_arrive_time" type="date" placeholder="选择择要求发货日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+            <el-date-picker v-model="form.rq_arrive_time" type="date" placeholder="选择要求发货日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="实际到达日期">

src/views/order/transport/index.vue

@@ -279,7 +279,7 @@ export default {
     await this.search();
   },
   methods: {
-    ...order(['query']),
+    ...order(['transportQuery']),
     ...client({ clientQuery: 'query' }),
     ...route({ routeQuery: 'query' }),
     ...transport({ transportNo: 'transportNo', transportCreate: 'create' }),
@@ -290,7 +290,7 @@ export default {
     ...mode({ modeQuery: 'query' }),
     async search({ skip = 0, limit = this.limit, ...info } = {}) {
       //查订单
-      let res = await this.query({ skip, limit, ...info });
+      let res = await this.transportQuery({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         const { data, total } = res;
         let newArray = [];