jczz_web.git - Gitblit

parent: 0e6a3ed3 | patch | commit | ignore whitespace

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

shuishen

2023-12-18 ba3eba0d9b1e3e1c4846e31cfaf6371dd2429a73

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

3 files modified

	src/views/article/article.vue	17 ●●●●● patch \| view \| raw \| blame \| history
	src/views/article/discussionManage.vue	97 ●●●●● patch \| view \| raw \| blame \| history
	src/views/article/publicSignUp.vue	44 ●●●●● patch \| view \| raw \| blame \| history

 src/views/article/article.vue

@@ -345,7 +345,22 @@
                value: 1
              }]
            },

            {
              labelWidth: 100,
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '开启',
                value: 0
              }, {
                label: '不开启',
                value: 1
              }]
            },
            {
              label: "截止时间",
              row: true,

 src/views/article/discussionManage.vue

@@ -226,14 +226,12 @@
        optionDiscussEdit: {
          column: [{
              label: "",
              // labelWidth: 20,
              type: 'title',
              prop: "title",
              span: 24,
              row: true,
              offset: 2,
              styles: {
                // color: 'red',
                fontSize: '24px'
              }
            }, {
@@ -253,72 +251,18 @@
              }]
            }, {
              labelWidth: 100,
              label: '多房屋可重复',
              prop: 'repeatVote',
              label: '开启签名',
              prop: 'signatureFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '不可以',
                label: '开启',
                value: 0
              }, {
                label: '可以',
                label: '不开启',
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '投票限制',
              prop: 'voteRestrictions',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '一人一票',
                value: 0
              }, {
                label: '一户一票',
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '用户限制',
              prop: 'userRestrictions',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '不限制',
                value: 0
              }, {
                label: '必须绑定手机',
                value: 1
              }, {
                label: '必须绑定房屋',
                value: 2
              }]
            }, {
              labelWidth: 100,
              label: '票数公开',
              prop: 'voteNumberPublic',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '全程公开',
                value: 0
              }, {
                label: '投票后公开',
                value: 1
              }, {
                label: '投票结束后公开',
                value: 2
              }, {
                label: '不公开',
                value: 3
              }]
            },
            {
@@ -330,35 +274,6 @@
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "timestamp",
            },
            // {
            //   labelWidth: 100,
            //   label: '人数限制',
            //   prop: 'numberRestrictions',
            //   type: 'number',
            //   button: true,
            //   row: true,
            //   min: 0,
            //   max: 99999999,
            //   controlsPosition: '',
            //   step: 10,
            //   offset: 6,
            // },
            // {
            //   labelWidth: 100,
            //   label: '指定用户',
            //   prop: 'appointUser',
            //   type: 'radio',
            //   button: true,
            //   row: true,
            //   offset: 6,
            //   dicData: [{
            //     label: '不限制',
            //     value: 0
            //   }, {
            //     label: '指定用户可见',
            //     value: 1
            //   }]
            // },
          ]
        },
        disCussFrom: {
@@ -451,7 +366,7 @@
        },
        // 表单列表
        data: [],
        userData:[],
        userData: [],
        dataTop: [],
        dialogVisibles: false,
        publicDiscussId: '',
@@ -722,4 +637,4 @@
  .el-pagination {
    margin-top: 20px;
  }
</style>
</style>

 src/views/article/publicSignUp.vue

@@ -115,7 +115,7 @@
              }
            }, {
              labelWidth: 100,
              label: '开启投票',
              label: '开启',
              prop: 'openFlag',
              type: 'radio',
              button: true,
@@ -131,48 +131,18 @@
            },
            {
              labelWidth: 100,
              label: '人数限制',
              prop: 'numberRestrictions',
              type: 'number',
              button: true,
              row: true,
              min: 0,
              max: 99999999,
              controlsPosition: '',
              step: 10,
              offset: 6,
            }, {
              labelWidth: 100,
              label: '投票限制',
              prop: 'voteRestrictions',
              label: '开启投票',
              prop: 'openFlag',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '一人一票',
                label: '开启',
                value: 0
              }, {
                label: '一户一票',
                label: '不开启',
                value: 1
              }]
            }, {
              labelWidth: 100,
              label: '用户限制',
              prop: 'userRestrictions',
              type: 'radio',
              button: true,
              row: true,
              offset: 6,
              dicData: [{
                label: '不限制',
                value: 0
              }, {
                label: '必须绑定手机',
                value: 1
              }, {
                label: '必须绑定房屋',
                value: 2
              }]
            },
            {
@@ -291,7 +261,7 @@
      },
      openUser(row) {
        this.dialogVisiblesUser = true
        this.getUser(this.pageUser,params = {})
        this.getUser(this.pageUser, params = {})
      },
      openDilog(row, type) {
        this.dialogVisibles = true
@@ -438,4 +408,4 @@
  .el-pagination {
    margin-top: 20px;
  }
</style>
</style>

			@@ -345,7 +345,22 @@
			value: 1
			}]
			},

			{
			labelWidth: 100,
			label: '开启投票',
			prop: 'openFlag',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '开启',
			value: 0
			}, {
			label: '不开启',
			value: 1
			}]
			},
			{
			label: "截止时间",
			row: true,

			@@ -226,14 +226,12 @@
			optionDiscussEdit: {
			column: [{
			label: "",
			// labelWidth: 20,
			type: 'title',
			prop: "title",
			span: 24,
			row: true,
			offset: 2,
			styles: {
			// color: 'red',
			fontSize: '24px'
			}
			}, {
			@@ -253,72 +251,18 @@
			}]
			}, {
			labelWidth: 100,
			label: '多房屋可重复',
			prop: 'repeatVote',
			label: '开启签名',
			prop: 'signatureFlag',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '不可以',
			label: '开启',
			value: 0
			}, {
			label: '可以',
			label: '不开启',
			value: 1
			}]
			}, {
			labelWidth: 100,
			label: '投票限制',
			prop: 'voteRestrictions',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '一人一票',
			value: 0
			}, {
			label: '一户一票',
			value: 1
			}]
			}, {
			labelWidth: 100,
			label: '用户限制',
			prop: 'userRestrictions',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '不限制',
			value: 0
			}, {
			label: '必须绑定手机',
			value: 1
			}, {
			label: '必须绑定房屋',
			value: 2
			}]
			}, {
			labelWidth: 100,
			label: '票数公开',
			prop: 'voteNumberPublic',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '全程公开',
			value: 0
			}, {
			label: '投票后公开',
			value: 1
			}, {
			label: '投票结束后公开',
			value: 2
			}, {
			label: '不公开',
			value: 3
			}]
			},
			{
			@@ -330,35 +274,6 @@
			format: "yyyy-MM-dd hh:mm:ss",
			valueFormat: "timestamp",
			},
			// {
			// labelWidth: 100,
			// label: '人数限制',
			// prop: 'numberRestrictions',
			// type: 'number',
			// button: true,
			// row: true,
			// min: 0,
			// max: 99999999,
			// controlsPosition: '',
			// step: 10,
			// offset: 6,
			// },
			// {
			// labelWidth: 100,
			// label: '指定用户',
			// prop: 'appointUser',
			// type: 'radio',
			// button: true,
			// row: true,
			// offset: 6,
			// dicData: [{
			// label: '不限制',
			// value: 0
			// }, {
			// label: '指定用户可见',
			// value: 1
			// }]
			// },
			]
			},
			disCussFrom: {
			@@ -451,7 +366,7 @@
			},
			// 表单列表
			data: [],
			userData:[],
			userData: [],
			dataTop: [],
			dialogVisibles: false,
			publicDiscussId: '',
			@@ -722,4 +637,4 @@
			.el-pagination {
			margin-top: 20px;
			}
			</style>
			</style>

			@@ -115,7 +115,7 @@
			}
			}, {
			labelWidth: 100,
			label: '开启投票',
			label: '开启',
			prop: 'openFlag',
			type: 'radio',
			button: true,
			@@ -131,48 +131,18 @@
			},
			{
			labelWidth: 100,
			label: '人数限制',
			prop: 'numberRestrictions',
			type: 'number',
			button: true,
			row: true,
			min: 0,
			max: 99999999,
			controlsPosition: '',
			step: 10,
			offset: 6,
			}, {
			labelWidth: 100,
			label: '投票限制',
			prop: 'voteRestrictions',
			label: '开启投票',
			prop: 'openFlag',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '一人一票',
			label: '开启',
			value: 0
			}, {
			label: '一户一票',
			label: '不开启',
			value: 1
			}]
			}, {
			labelWidth: 100,
			label: '用户限制',
			prop: 'userRestrictions',
			type: 'radio',
			button: true,
			row: true,
			offset: 6,
			dicData: [{
			label: '不限制',
			value: 0
			}, {
			label: '必须绑定手机',
			value: 1
			}, {
			label: '必须绑定房屋',
			value: 2
			}]
			},
			{
			@@ -291,7 +261,7 @@
			},
			openUser(row) {
			this.dialogVisiblesUser = true
			this.getUser(this.pageUser,params = {})
			this.getUser(this.pageUser, params = {})
			},
			openDilog(row, type) {
			this.dialogVisibles = true
			@@ -438,4 +408,4 @@
			.el-pagination {
			margin-top: 20px;
			}
			</style>
			</style>