Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/test.env.js

@@ -5,8 +5,8 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"testing"',
   ENV_CONFIG: '"test"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL: '"http://192.168.0.115:8080"',
-  APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  // BASE_URL: '"http://192.168.0.115:8080"',
+  APP_BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',    // app打包上传地址
   CONSOLE_BASE_URL: '"https://test.baoxianzhanggui.com/console-api"' //控制台测试服务器
-})
+})

src/views/PeopleManage/Seo/StaffSeo.vue

@@ -567,14 +567,21 @@ export default {
       dialogVisible: false, // 新增编辑界面是否显示
       columns: [
         // 数据列
-        { prop: "deptId", label: "部门编码", minWidth: 100, sortable: false },
-        {
-          prop: "pdeptName",
-          label: "机构名称",
-          minWidth: 120,
-          sortable: false,
-        },
-        { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
+        // { prop: "deptId", label: "部门编码", minWidth: 100, sortable: false },
+        // {
+        //   prop: "pdeptName",
+        //   label: "机构名称",
+        //   minWidth: 120,
+        //   sortable: false,
+        // },
+        // { prop: "deptName", label: "部门名称", minWidth: 80, sortable: false },
+        { prop: "levelFourDeptId", label: "机构编码", minWidth: 120, sortable: false },
+        { prop: "levelFourDeptName", label: "机构名称", minWidth: 120, sortable: false },
+        { prop: "pdeptId", label: "工作室编码", minWidth: 120, sortable: false },
+        { prop: "pdeptName", label: "工作室名称", minWidth: 120, sortable: false },
+        { prop: "deptId", label: "部门编码", minWidth: 120, sortable: false },
+        { prop: "deptName", label: "部门名称", minWidth: 120, sortable: false },
+        
         { prop: "userId", label: "工号", minWidth: 120, sortable: false },
         { prop: "name", label: "姓名", minWidth: 90, sortable: false },
         {

src/views/Sys/Appversion.vue

@@ -309,6 +309,7 @@ export default {
       this.addshow = true;
     },
     addAppshowAdd() {
+      this.appformLabelAlign.sid = "";
       this.appformLabelAlign.title = "";
       this.appformLabelAlign.content = "";
       this.appformLabelAlign.apptype = "";
@@ -518,6 +519,7 @@ export default {
     SubmitapplyForm() {
       this.$refs.applyformLabelAlign.validate((valid) => {
         if (valid) {
+          console.log(this.applyformLabelAlign);
           this.$api.app.AppSave(this.applyformLabelAlign).then((res) => {
             if (res.code == 200) {
               this.$message({ message: "操作成功", type: "success" });