lrf402788946 4 年之前
父節點
當前提交
20407fb479
共有 2 個文件被更改,包括 7 次插入10 次删除
  1. 0 7
      src/views/order/index-parts/form.vue
  2. 7 3
      src/views/order/index.vue

+ 0 - 7
src/views/order/index-parts/form.vue

@@ -86,13 +86,6 @@
                   <el-input-number controls-position="right" v-model="row.volume" :min="0"></el-input-number>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="运输类型">
-                <template v-slot="{ row }">
-                  <el-select v-model="row.transport_type" placeholder="请选择运输类型">
-                    <el-option v-for="(i, index) in transport_type" :key="index" :label="i" :value="i"></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
               <el-table-column align="center" label="备注">
                 <template v-slot="{ row }">
                   <el-input v-model="row.remark" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" placeholder="若需要备注请在此处填写"></el-input>

+ 7 - 3
src/views/order/index.vue

@@ -111,9 +111,13 @@ export default {
     async search({ skip = 0, limit = 10 } = {}) {
       let duplicate = _.cloneDeep(this.sform);
       let { date, ...info } = duplicate;
-      let query = { skip, limit, ...info };
-      if (this.user.role !== '0') query.principal = this.user.id;
-      const res = await this.query({ skip, limit, ...info });
+      let querys = { skip, limit, ...info };
+      if (date && date.length === 2) {
+        querys[`rq_send_time@start`] = date[0];
+        querys[`rq_send_time@end`] = date[1];
+      }
+      if (this.user.role !== '0') querys.principal = this.user.id;
+      const res = await this.query(querys);
       if (this.$checkRes(res)) {
         const { data, total } = res;
         this.$set(this, `list`, data);