Merge branch 'xuanhan' of http://gitlab.scsmile.cn/zxf/smart_gov_platform into xuanhan

base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue

@@ -70,7 +70,7 @@
         </template>
         <!-- 类型 -->
         <template slot="appType" slot-scope="{ record }">
-          {{ record.appType === 1 ? "应用程序" : "URL" }}
+          {{ appType[record.appType] }}
         </template>
         <!-- 上下架 -->
         <template slot="shelves" slot-scope="{ record }">
@@ -145,6 +145,13 @@ import {
 } from "@/services/market";
 import local from "@/utils/local";
 import { mapMutations, mapGetters } from "vuex";
+let appType = {
+  1: "应用程序",
+  2: "URL",
+  3: "微信小程序",
+  4: "天府通办",
+  5: "Router",
+};
 const columns = [
   {
     title: "序号",
@@ -206,6 +213,7 @@ export default {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
+      appType,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -70,7 +70,7 @@
         </template>
         <!-- 类型 -->
         <template slot="appType" slot-scope="{ record }">
-          {{ record.appType === 1 ? "应用程序" : "URL" }}
+          {{ appType[record.appType] }}
         </template>
         <!-- 上下架 -->
         <template slot="shelves" slot-scope="{ record }">
@@ -145,6 +145,13 @@ import {
 import local from "@/utils/local";
 import { mapMutations, mapGetters } from "vuex";
 import YTable from "@/components/YTable.vue";
+let appType = {
+  1: "应用程序",
+  2: "URL",
+  3: "微信小程序",
+  4: "天府通办",
+  5: "Router",
+};
 const columns = [
   {
     title: "序号",
@@ -206,6 +213,7 @@ export default {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       columns,
+      appType,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -74,6 +74,7 @@
               <a-radio :value="2"> URL </a-radio>
               <a-radio :value="3" v-if="form.type != 1"> 微信小程序 </a-radio>
               <a-radio :value="4" v-if="form.type != 2"> 天府通办 </a-radio>
+              <a-radio :value="5"> Router </a-radio>
             </a-radio-group>
           </a-form-model-item>
           <a-form-model-item
@@ -301,6 +302,7 @@ export default {
     // 改变类型
     changeAppType(e) {
       let val = e.target.value;
+      this.$refs.form.clearValidate(["url", "filePath"]);
       if (val == 1) {
         this.form.url = "";
       } else {

base-manager-ui/admin/src/pages/basicset/deploy/Statement.vue

@@ -264,10 +264,12 @@ export default {
     },
 
     filterModel(modelId) {
+      let modelName = "--";
       let curModel = this.modelData.find((item) => item.id === modelId);
       if (curModel) {
-        return curModel.modelName;
+        modelName = curModel.modelName;
       }
+      return modelName;
     },
   },
 };

base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue

@@ -246,7 +246,7 @@ export default {
       siteMatterData: [], // 站点事项列表
       matterKeys: [],
       matterRows: [],
-      allDel: "", // 批量删除id
+      allDel: [], // 批量删除id
       windowInfo: {},
       formData: {
         isShow: 1,
@@ -335,6 +335,7 @@ export default {
     // 窗口事项搜索
     onSearch() {
       this.winMatterTable.page = 1;
+      this.allDel = [];
       this.getWindowmatterData();
     },
     // 保存站点事项加入窗口
@@ -372,7 +373,7 @@ export default {
     },
     // 全选窗口事项列表
     onSelectChange(keys) {
-      this.allDel = keys.join(",");
+      this.allDel = keys;
     },
     // 站点事项选择
     handleChange(keys, rows) {
@@ -410,7 +411,7 @@ export default {
           let { code, msg } = res.data;
           if (code === 1) {
             _this.$message.success(msg);
-            this.allDel = "";
+            _this.allDel = [];
             _this.getWindowmatterData();
           }
         },
@@ -421,8 +422,9 @@ export default {
     },
     // 批量删除窗口事项
     handleDelAll() {
-      if (this.allDel) {
-        this.handleDel(this.allDel);
+      if (this.allDel.length) {
+        let ids = this.allDel.join(",");
+        this.handleDel(ids);
       } else {
         this.$message.warning("请先勾选数据");
         return;