Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/components/tableson.vue

@@ -77,8 +77,8 @@
           <el-col :span="12">
             <el-form-item label="排序" prop="order">
               <el-input
-                type="age"
-                v-model="temp.order"
+                type="number" 
+                v-model.number="temp.order"
                 placeholder="请输入排序值，数值越大，排序越靠前"
               ></el-input>
             </el-form-item>
@@ -136,40 +136,40 @@ import {
   fetchPv,
   createArticle,
   updateArticle
-} from "@/api/article";
-import waves from "@/directive/waves"; // 水波纹指令
-import { parseTime } from "@/utils";
-import store from "@/store";
-import bus from "@/assets/eventBus";
+} from '@/api/article'
+import waves from '@/directive/waves' // 水波纹指令
+import { parseTime } from '@/utils'
+import store from '@/store'
+import bus from '@/assets/eventBus'
 import {
   createConfig,
   createChildConfig,
   updateChildConfig,
   deleteChildConfig
-} from "@/api/data";
+} from '@/api/data'
 
 const calendarTypeOptions = [
-  { key: "CN", display_name: "China" },
-  { key: "US", display_name: "USA" },
-  { key: "JP", display_name: "Japan" },
-  { key: "EU", display_name: "Eurozone" }
-];
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
 
 // arr to obj ,such as { CN : "China", US : "USA" }
 const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name;
-  return acc;
-}, {});
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
 
 export default {
-  name: "tableson",
+  name: 'tableson',
   directives: {
     waves
   },
   props: {
     type: {
       type: String,
-      default: "patient"
+      default: 'patient'
     }
   },
   data() {
@@ -184,56 +184,54 @@ export default {
         importance: undefined,
         title: undefined,
         type: this.type,
-        sort: "+id"
+        sort: '+id'
       },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
       sortOptions: [
-        { label: "ID Ascending", key: "+id" },
-        { label: "ID Descending", key: "-id" }
+        { label: 'ID Ascending', key: '+id' },
+        { label: 'ID Descending', key: '-id' }
       ],
-      statusOptions: ["published", "draft", "deleted"],
+      statusOptions: ['published', 'draft', 'deleted'],
       showReviewer: false,
       temp: {
         id: undefined,
         parent_id: 0,
         module: this.type,
         org_id: 0,
-        name: "",
+        name: '',
         field_name: undefined,
-        value: "",
-        remark: ""
+        value: '',
+        remark: ''
       },
       dialogFormVisible: false,
-      dialogStatus: "",
+      dialogStatus: '',
       textMap: {
-        update: "编辑",
-        create: "新增"
+        update: '编辑',
+        create: '新增'
       },
       dialogPvVisible: false,
       pvData: [],
       rules: {
-        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        order: [
-          { type: "number", message: "排序必须为数字值", trigger: "blur" }
-        ]
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+        order: [{ type: 'number', message: '排序必须为数字11', trigger: 'blur' }]
         // timestamp: [{ type: 'date', required: true, message: 'timestamp is required', trigger: 'change' }],
         // title: [{ required: true, message: 'title is required', trigger: 'blur' }]
       },
       downloadLoading: false,
       parentConfig: undefined,
       addState: true
-    };
+    }
   },
   computed: {
     list: function() {
       if (this.parentConfig != undefined) {
-        this.addState = false;
-        const list = store.getters.configlist[this.parentConfig.module];
+        this.addState = false
+        const list = store.getters.configlist[this.parentConfig.module]
         for (var i = 0; i < list.length; i++) {
           if (list[i].id === this.parentConfig.id) {
-            return list[i]["childs"];
-            break;
+            return list[i]['childs']
+            break
           }
         }
         // return store.getters.configlist[this.parentConfig.module][this.parentConfig.index ]["childs"];
@@ -243,90 +241,90 @@ export default {
   filters: {
     statusFilter(status) {
       const statusMap = {
-        published: "success",
-        draft: "info",
-        deleted: "danger"
-      };
-      return statusMap[status];
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
     },
     typeFilter(type) {
-      return calendarTypeKeyValue[type];
+      return calendarTypeKeyValue[type]
     }
   },
   created() {
     // this.getList()
   },
   mounted() {
-    var _this = this;
-    bus.$on("parentChangeId", function(parentData) {
-      _this.parentConfig = parentData;
+    var _this = this
+    bus.$on('parentChangeId', function(parentData) {
+      _this.parentConfig = parentData
       // _this.list = parentData.childs
       _this.temp = {
         id: undefined,
         parent_id: parentData.id,
         module: parentData.module,
         org_id: parentData.org_id,
-        name: "",
+        name: '',
         field_name: undefined,
-        value: "",
-        remark: ""
-      };
-    });
+        value: '',
+        remark: ''
+      }
+    })
   },
   methods: {
     handleRowChange(currentRow, oldCurrentRow) {
-      this.currentId = currentRow.id;
+      this.currentId = currentRow.id
     },
 
     handleFilter() {
-      this.listQuery.page = 1;
-      this.getList();
+      this.listQuery.page = 1
+      this.getList()
     },
     handleSizeChange(val) {
-      this.listQuery.limit = val;
-      this.getList();
+      this.listQuery.limit = val
+      this.getList()
     },
     handleCurrentChange(val) {
-      this.listQuery.page = val;
-      this.getList();
+      this.listQuery.page = val
+      this.getList()
     },
     handleModifyStatus(row, status) {
-      this.temp = Object.assign({}, row); // copy obj
-      this.$confirm("此操作将永久删除该配置项, 是否继续?", "提示", {
-        confirmButtonText: "确 定",
-        cancelButtonText: "取 消",
-        type: "warning"
+      this.temp = Object.assign({}, row) // copy obj
+      this.$confirm('此操作将永久删除该配置项, 是否继续?', '提示', {
+        confirmButtonText: '确 定',
+        cancelButtonText: '取 消',
+        type: 'warning'
       })
         .then(() => {
-          const tempData = Object.assign({}, this.temp);
+          const tempData = Object.assign({}, this.temp)
           deleteChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack
-              reject("error");
+              reject('error')
             }
             if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
+              this.$message.error(response.data.msg)
             }
 
-            const result = response.data.data.dataconfig;
+            const result = response.data.data.dataconfig
             store
-              .dispatch("updateChildConfigList", [tempData, "delete"])
+              .dispatch('updateChildConfigList', [tempData, 'delete'])
               .then(() => {
-                next();
-              });
-          });
+                next()
+              })
+          })
 
           this.$message({
-            type: "success",
-            message: "删除成功!"
-          });
+            type: 'success',
+            message: '删除成功!'
+          })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "已取消删除"
-          });
-        });
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
     },
     resetTemp() {
       this.temp = {
@@ -334,123 +332,123 @@ export default {
         parent_id: this.parentConfig.id,
         module: this.parentConfig.module,
         org_id: this.parentConfig.org_id,
-        name: "",
+        name: '',
         field_name: undefined,
-        value: "",
-        remark: ""
-      };
+        value: '',
+        remark: ''
+      }
     },
     handleCreate() {
-      this.resetTemp();
-      this.dialogStatus = "create";
-      this.dialogFormVisible = true;
+      this.resetTemp()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
       this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
+        this.$refs['dataForm'].clearValidate()
+      })
     },
     createData() {
-      this.$refs["dataForm"].validate(valid => {
+      this.$refs['dataForm'].validate(valid => {
         if (valid) {
           createChildConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack
-              reject("error");
+              reject('error')
             }
             if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
+              this.$message.error(response.data.msg)
             }
-            const result = response.data.data.dataconfig;
+            const result = response.data.data.dataconfig
 
             // this.list.unshift(tempval)
             // 更新store
             store
-              .dispatch("updateChildConfigList", [result, "create"])
-              .then(() => {});
+              .dispatch('updateChildConfigList', [result, 'create'])
+              .then(() => {})
 
-            this.dialogFormVisible = false;
-            this.$message.success("创建成功");
-          });
+            this.dialogFormVisible = false
+            this.$message.success('创建成功')
+          })
         }
-      });
+      })
     },
     handleUpdate(row) {
-      this.temp = Object.assign({}, row); // copy obj
-      this.dialogStatus = "update";
-      this.dialogFormVisible = true;
+      this.temp = Object.assign({}, row) // copy obj
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
       this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
+        this.$refs['dataForm'].clearValidate()
+      })
     },
     updateData() {
-      this.$refs["dataForm"].validate(valid => {
+      this.$refs['dataForm'].validate(valid => {
         if (valid) {
-          const tempData = Object.assign({}, this.temp);
-          console.log("tempData", tempData);
+          const tempData = Object.assign({}, this.temp)
+          console.log('tempData', tempData)
           updateChildConfig(tempData).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack
-              reject("error");
+              reject('error')
             }
             if (response.data.state === 0) {
-              this.$message.error(response.data.msg);
+              this.$message.error(response.data.msg)
             }
 
-            const result = response.data.data.dataconfig;
+            const result = response.data.data.dataconfig
             store
-              .dispatch("updateChildConfigList", [result, "update"])
-              .then(() => {});
+              .dispatch('updateChildConfigList', [result, 'update'])
+              .then(() => {})
 
-            this.dialogFormVisible = false;
+            this.dialogFormVisible = false
 
-            this.$message.success("更新成功");
-          });
+            this.$message.success('更新成功')
+          })
         }
-      });
+      })
     },
     handleDelete(row) {
-      this.$message.success("删除成功");
-      const index = this.list.indexOf(row);
-      this.list.splice(index, 1);
+      this.$message.success('删除成功')
+      const index = this.list.indexOf(row)
+      this.list.splice(index, 1)
     },
     handleFetchPv(pv) {
       fetchPv(pv).then(response => {
-        this.pvData = response.data.pvData;
-        this.dialogPvVisible = true;
-      });
+        this.pvData = response.data.pvData
+        this.dialogPvVisible = true
+      })
     },
     handleDownload() {
-      this.downloadLoading = true;
-      import("@/vendor/Export2Excel").then(excel => {
-        const tHeader = ["timestamp", "title", "type", "importance", "status"];
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
         const filterVal = [
-          "timestamp",
-          "title",
-          "type",
-          "importance",
-          "status"
-        ];
-        const data = this.formatJson(filterVal, this.list);
+          'timestamp',
+          'title',
+          'type',
+          'importance',
+          'status'
+        ]
+        const data = this.formatJson(filterVal, this.list)
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: "table-list"
-        });
-        this.downloadLoading = false;
-      });
+          filename: 'table-list'
+        })
+        this.downloadLoading = false
+      })
     },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v =>
         filterVal.map(j => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
+          if (j === 'timestamp') {
+            return parseTime(v[j])
           } else {
-            return v[j];
+            return v[j]
           }
         })
-      );
+      )
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped></style>