Merge pull request 'master' (#122) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/122
2024-09-28 12:40:04 +00:00
parent e59ca5d96c 3ac16d6eda
commit e0ef98ef70
4 changed files with 89 additions and 38 deletions
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -17,6 +17,16 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="外部配置类型" prop="extraConfigType">
+        <el-select v-model="queryParams.extraConfigType" placeholder="请选择外部配置类型" clearable filterable>
+          <el-option
+              v-for="dict in cacheStore.getDict('extra_config_type')"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
@@ -28,8 +38,8 @@
                 :icon="Delete" plain
                 :disabled="disabled">删除
      </el-button>
-      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
+<!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
+<!--      </el-button>-->
    </div>
    <div class="table">
      <el-table
@@ -51,13 +61,23 @@
            <tag dict-type="yes_no" :value="scope.row.configType"/>
          </template>
        </el-table-column>
+        <el-table-column prop="extraConfigType" label="外部配置类型" align="center">
+          <template #default="scope">
+            <div v-if="scope.row.extraConfigType">
+              <tag dict-type="extra_config_type" :value="scope.row.extraConfigType"/>
+            </div>
+            <div v-else>
+              <span>--</span>
+            </div>
+          </template>
+        </el-table-column>
        <el-table-column prop="remark" label="备注" align="center"/>
        <el-table-column label="操作">
          <template #default="scope">
            <el-button type="primary" size="mini" v-perm="['admin:config:edit']"
                       @click="handleEdit(scope.row.configId)" link>编辑
            </el-button>
-            <popover-delete :name="scope.row.dsName" :type="'参数配置表'" :perm="['admin:config:del']"
+            <popover-delete :name="scope.row.configName" :type="'参数配置表'" :perm="['admin:config:del']"
                            @delete="handleDelete(scope.row.configId)"/>
          </template>
        </el-table-column>
@@ -96,11 +116,24 @@
              </el-select>
            </el-form-item>
          </el-col>
+
          <el-col :span="11">
            <el-form-item label="备注" prop="remark">
              <el-input v-model="form.remark" placeholder="请输备注"></el-input>
            </el-form-item>
          </el-col>
+          <el-col :span="11"  :offset="2">
+            <el-form-item label="外部配置类型" prop="extraConfigType" v-if="form.configType==0">
+              <el-select v-model="form.extraConfigType" placeholder="请选择外部配置类型" clearable filterable>
+                <el-option
+                    v-for="dict in cacheStore.getDict('extra_config_type')"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
        </el-row>
      </el-form>
      <template #footer>
@@ -148,16 +181,16 @@ const form = ref()
 const formInstance = ref()
 const formRules = ref({
  configName: [
-    {required: true, message: "参数名称不能为空", trigger: "blur"},
+    {required: true, message: "参数名称不能为空", trigger: ["change","blur"]},
  ],
  configKey: [
-    {required: true, message: "参数键名不能为空", trigger: "blur"},
+    {required: true, message: "参数键名不能为空", trigger: ["change","blur"]},
  ],
  configValue: [
-    {required: true, message: "参数键值不能为空", trigger: "blur"},
+    {required: true, message: "参数键值不能为空", trigger:["change","blur"]},
  ],
  configType: [
-    {required: true, message: "系统内置不能为空", trigger: "change"},
+    {required: true, message: "系统内置不能为空", trigger: ["change","blur"]},
  ],
 })

@@ -231,7 +264,7 @@ const handleAdd = async () => {
  restFrom()
  title.value = "新增参数配置表"
  isVisited.value = true
-  nextTick(() => {
+  await nextTick(() => {
    // 清空校验
    formInstance.value.clearValidate()
  })
@@ -253,10 +286,10 @@ const handleEdit = async (configId) => {
    formInstance.value.clearValidate()
  })
 }
-//导出excel
-const handleExport = () => {
-  downLoadExcel('/config/export', {...queryParams})
-}
+// //导出excel
+// const handleExport = () => {
+//   downLoadExcel('/config/export', {...queryParams})
+// }

 //勾选table数据行的 Checkbox
 const handleSelect = async (selection) => {
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -81,10 +81,10 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
+    label: '创建时间',
    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
      type: 'datetime',
      clearable: true,
      checkStrictly: true,
@@ -96,18 +96,22 @@ const searchConfig = reactive([
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
--- a/src/views/task-management/historical-work-order/index.vue
+++ b/src/views/task-management/historical-work-order/index.vue
@@ -72,30 +72,37 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
-    prop: 'createTime',
+    label: '创建时间',
+    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
-  }, {
+  },
+  {
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
@@ -167,7 +174,7 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'createTime',
+      prop: 'createdTime',
      label: '创建时间',
      align: 'center',
      width: 200
--- a/src/views/task-management/pending-work-order/index.vue
+++ b/src/views/task-management/pending-work-order/index.vue
@@ -72,30 +72,37 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
-    prop: 'createTime',
+    label: '创建时间',
+    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
-  }, {
+  },
+  {
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
@@ -167,7 +174,7 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'createTime',
+      prop: 'createdTime',
      label: '创建时间',
      align: 'center',
      width: 200