Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

zhongrj

2024-03-25 47da3431e83b716ec9e82623b30a80be962e87c2

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/article/components/deitDiscussion.vue

@@ -133,6 +133,26 @@
              }],
            },
            {
          label: '议题必填',
          prop: 'mandatoryFlag',
          type: 'radio',
          value: 1,
          button: true,
          row: true,
          dicData: [{
            label: '否',
            value: 1
          }, {
            label: '是',
            value: 2
          }],
          rules: [{
            required: true,
            message: '请选择是否必填',
            trigger: 'blur'
          }],
        },
        {
              label: '选项范围',
              prop: 'optionRange',
              type: 'radio',
@@ -140,11 +160,11 @@
              button: true,
              row: true,
              dicData: [{
                label: '多选',
                value: 1
              }, {
                label: '单选',
                value: 0
          }, {
            label: '多选',
            value: 1
              }],
              rules: [{
                required: true,
@@ -152,14 +172,38 @@
                trigger: 'blur'
              }],
            },

            {
              label: '最多选择数',
          label: '最多可选',
              prop: 'optionNumber',
              display: false,
              min: 1,
              type: 'number',
              step: 1,
              value: 1
          value: 1,
          rules: [{
            required: true,
            message: '请输入最多可选择数量',
            trigger: 'blur'
          }],
          span: 4,
        },

        {
          width: 110,
          labelWidth: 100,
          label: "附件",
          prop: "attachment",
          type: "upload",
          listType: "text",
          action: "/api/blade-resource/oss/endpoint/put-pdfFile",
          accept: "application/pdf",
          propsHttp: {
            res: "data",
            name: 'name',
            url: "link",
          },
          span: 24,
            },
            {
              label: '选项内容',
@@ -384,6 +428,7 @@
      },

      initData(newData) {
      console.log("======>",  newData);
        this.editFlag = false
        this.popupTableShow = true
        this.articleId = newData.id
@@ -402,6 +447,33 @@
      handleSubmit(form, done) {
        done()
        form.articleId = this.articleId
      console.log("form===>", form);


      if (this.editFlag && Array.isArray(form.attachment)) {
        if (form.attachment.length > 0) {
          var urls = []
          // var split = form.attachment.split(",")
          form.attachment.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          form.attachment = urls.join(",")
        }else {
          form.attachment = "";
        }
      } else {
        if (form.attachment) {
          var urls = [];
          var splits = form.attachment.split(",");
          splits.forEach(url => {
            var names = url.split("jczz/")
            urls.push(names[1])
          })
          form.attachment = urls.join(",")
        }
      }

        if (this.disCussFromListClone.length > 0) {
          this.disCussFromListClone.forEach(item => {
            if (form.children.length > 0) {
@@ -443,6 +515,17 @@
      // 提交修改
      rowUpdate(row, index, done, loading) {
        done()

      if (row.attachment.length > 0) {
        var urls = []
        var split = row.attachment.split(",")
        split.forEach(url => {
          var names = url.split("jczz/")
          urls.push(names[1])
        })
        row.attachment = urls.join(",")
      }

        if (!row.id) {
          addPd(row).then(() => {
            this.onLoad()

 src/views/article/rotation.vue

@@ -102,6 +102,7 @@
              prop: "publicFlag",
              span: 12,
              searchSpan: 4,
              type: "select",
              // search: true,
              // cascader: ["communityCode"],
              type: "select",
@@ -270,6 +271,13 @@
    },
    methods: {
      rowSave(row, done, loading) {
        if (row.rotationRange) {
          row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.publicFlag == 2) {
          row.rotationRange = []
          row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -295,6 +303,13 @@
        )
      },
      rowUpdate(row, index, done, loading) {
        if (row.rotationRange) {
          row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.publicFlag == 2) {
          row.rotationRange = []
          row.rotationRange = JSON.stringify(row.rotationRange)
        }
        if (row.url.length > 0) {
          var urls = []
          var split = row.url.split(",")
@@ -379,6 +394,9 @@
        if (["edit", "view"].includes(type)) {
          getRotation(this.form.id).then((res) => {
            this.form = res.data.data
            if (this.form.rotationRange) {
              this.form.rotationRange = JSON.parse(this.form.rotationRange)
            }
            if (this.form.url.length > 0) {
              var urls = []
              var names = this.form.url.split(",")
@@ -432,6 +450,9 @@
          this.page.total = data.total
          this.data = data.records
          this.data.forEach(item => {
            if (item.rotationRange) {
              item.rotationRange = JSON.parse(item.rotationRange)
            }
            if (item.url.length > 0) {
              var urls = []
              var names = item.url.split(",")

 src/views/gzll/components/done.vue

@@ -39,6 +39,7 @@
export default {
    data () {
        return {
        datetime: "",
            form: {},
            selectionId: '',
            selectionList: [],
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -89,6 +89,39 @@
                        // search: true,
                        hide: true,
                        width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    },
                    {
                        width: 100,
@@ -212,10 +245,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/gzll/components/todo.vue

@@ -43,6 +43,7 @@
  export default {
    data() {
      return {
        datetime: "",
        typeStatus: 1,
        form: {},
        selectionId: '',
@@ -123,6 +124,32 @@
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
            },
            {
              width: 110,
@@ -137,11 +164,7 @@
              // search: true,
              slot: true
            },
            {
              label: '项目名称',
              prop: 'name',
              search: true,
            },

            {
              label: '当前步骤',
              prop: 'taskName',
@@ -239,10 +262,20 @@
        this.onLoad(this.page, this.query)
      },
      onLoad(page, params = {}) {
        const query = {
        let query = {
          ...this.query,
          category: (params.category) ? flowCategory(params.category) : null
        }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
        this.loading = true
        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
          const data = {

 src/views/property/components/done.vue

@@ -39,6 +39,7 @@
export default {
    data () {
        return {
        datetime: "",
            form: {},
            selectionId: '',
            selectionList: [],
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -110,6 +110,39 @@
                        },
                        defaultExpandedKeys: ["361102003"],
                        span: 12,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    }, {
                        width: 110,
                        label: '联系人',
@@ -210,10 +243,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/property/components/todo.vue

@@ -43,6 +43,7 @@
export default {
    data () {
        return {
        datetime: "",
            typeStatus: 1,
            form: {},
            selectionId: '',
@@ -94,6 +95,39 @@
                    // search: true,
                    hide: true,
                    width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                },
                {
                    width: 100,
@@ -231,10 +265,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/propertySupervision/components/done.vue

@@ -40,6 +40,7 @@
    data () {
        return {
            form: {},
        datetime: "",
            selectionId: '',
            selectionList: [],
            query: {},
@@ -73,8 +74,7 @@
                dialogWidth: 900,
                dialogClickModal: false,
                header: false,
                column: [
                    {
          column: [{
                        label: "流程分类",
                        type: "select",
                        row: true,
@@ -89,6 +89,39 @@
                        // search: true,
                        hide: true,
                        width: 100,
            },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            }, {
              label: '项目名称',
              prop: 'name',
              search: true,
            },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
                    },
                    {
                        width: 100,
@@ -210,10 +243,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            doneList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/propertySupervision/components/todo.vue

@@ -43,6 +43,7 @@
export default {
    data () {
        return {
        datetime: "",
            typeStatus: 1,
            form: {},
            selectionId: '',
@@ -117,6 +118,41 @@
                    searchSpan: 5,
                    span: 12,
                },
            {
              width: 110,
              label: '小区名称',
              prop: 'districtName',
              search: true,
              hide: true,
            },
            // {
            //   label: '项目名称',
            //   prop: 'name',
            //   search: true,
            // },
            {
              label: "申请时间",
              prop: "dateTime",
              type: "datetimerange",
              defaultTime: ['00:00:00', '23:59:59'],
              format: 'yyyy-MM-dd HH:mm:ss',
              valueFormat: 'yyyy-MM-dd HH:mm:ss',
              startPlaceholder: '开始范围自定义',
              endPlaceholder: '结束范围自定义',
              searchSpan: 5,
              searchRange: true,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [{
                required: true,
                message: "请选择申请时间",
                trigger: "blur",
              }, ],
            },

                {
                    width: 110,
                    label: '联系人',
@@ -231,10 +267,20 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            const query = {
        let query = {
                ...this.query,
                category: (params.category) ? flowCategory(params.category) : null
            }
        const {
          dateTime
        } = query

        if (dateTime) {
          query = {
            startTimes: dateTime[0],
            endTimes: dateTime[1],
          }
        }
            this.loading = true
            todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
                const data = {

 src/views/wel/index.vue

@@ -105,7 +105,10 @@
                }
            ]

            if (this.globalUserInfo.role_name == 'administrator' || this.globalUserInfo.role_name.split(',').find(item => item == 'admin')) {
            if (this.globalUserInfo.role_name == 'administrator' ||
                this.globalUserInfo.role_name.indexOf('jdgly') != -1 ||
                this.globalUserInfo.role_name.indexOf('sqgly') != -1 ||
                this.globalUserInfo.role_name.split(',').find(item => item == 'admin')) {
                this.homeMenuData.push({
                    imageUrl: 'img/jsc.png',
                    url: `http://srgdjczzxtpt.com:2181/uniform-auth/login?app=app_smart_aoi&Blade-Auth=bearer ${getToken()}`,

 vue.config.js

@@ -38,7 +38,7 @@
        proxy: {
            "/api": {
                //本地服务接口地址
                target:"http://192.168.2.140:9528",
                target:"http://192.168.2.111:9528",
                // target: "https://srgdjczzxtpt.com:2080/api",
                // target: "https://kt39592615.goho.co",
                // target: "http://z4042833u6.wicp.vip",