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

src/plugins/check-res.js

@@ -16,6 +16,12 @@ const Plugin = {
       if (!_.isFunction(okText) && _.isObject(okText) && okText != null) {
         ({ okText: _okText, errText: _errText } = okText);
       }
+      if (!res) {
+        if (_errText) {
+          Message.error(_errText || errmsg);
+        }
+        return false;
+      }
       const { errcode = 0, errmsg } = res || {};
       if (errcode === 0) {
         if (_.isFunction(_okText)) {

src/views/personnel/driver.vue

@@ -22,6 +22,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: util } = createNamespacedHelpers('util');
+const { mapActions: driver } = createNamespacedHelpers('driver');
 export default {
   name: 'driver',
   props: {},
@@ -41,18 +42,7 @@ export default {
           method: 'delete',
         },
       ],
-      fields: [
-        { label: '姓名', required: false, model: 'name', filter: true },
-        { required: true, label: '联系电话', model: 'mobile', filter: true },
-        { required: true, label: '身份证号', model: 'id_number', filter: true },
-        { required: true, label: '驾驶证号', model: 'drive_card' },
-        { required: true, label: '初次领证时间', model: 'first_drive_card_time', type: 'date', notable: true },
-        { required: true, label: '准驾车型', model: 'car_type', notable: true },
-        { required: true, label: '驾驶证有效日期', model: 'valid_drive_time', type: 'date', notable: true },
-        { required: true, label: '驾驶证年检日期', model: 'check_drive_time', type: 'date', notable: true },
-        { required: true, label: '资格证年检日期', model: 'check_qualification_time', type: 'date', notable: true },
-        { required: true, label: '状态', model: 'status', filter: 'select', noform: true },
-      ],
+      fields: [],
       statusList: [],
       list: [],
       rules: {
@@ -63,11 +53,20 @@ export default {
     };
   },
   created() {
+    this.search();
     this.toGetModel();
   },
   methods: {
+    ...driver(['query', 'create', 'update', 'delete']),
     ...util(['getModel']),
-    async search({ skip = 0, limit = 10 }) {},
+    async search({ skip = 0, limit = 10, ...info } = {}) {
+      const res = await this.query({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        const { data, total } = res;
+        this.$set(this, `list`, data);
+        this.$set(this, `total`, total);
+      }
+    },
     async toSave() {
       let duplicate = _.cloneDeep(this.form);
       const { id } = this.form;
@@ -84,14 +83,13 @@ export default {
     },
     async toEdit({ data }) {
       this.dialog = true;
-      console.log('in function:toEdit');
+      this.$set(this, `form`, _.cloneDeep(data));
     },
     async toDelete({ data }) {
-      console.log('in function:delete');
-      // const res = await this.delete(data);
-      // if (this.$checkRes(res, '删除成功')) {
-      //   this.search();
-      // }
+      const res = await this.delete(data.id);
+      if (this.$checkRes(res, '删除成功', '删除失败')) {
+        this.search();
+      }
     },
     toAdd() {
       this.dialog = true;