From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

---
 src/views/propertySupervision/process/maintenanceFundApply/detail.vue |  734 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 366 insertions(+), 368 deletions(-)

diff --git a/src/views/propertySupervision/process/maintenanceFundApply/detail.vue b/src/views/propertySupervision/process/maintenanceFundApply/detail.vue
index dd59b1b..0b3df87 100644
--- a/src/views/propertySupervision/process/maintenanceFundApply/detail.vue
+++ b/src/views/propertySupervision/process/maintenanceFundApply/detail.vue
@@ -75,389 +75,387 @@
       </el-card>
     </el-form>
     <deitDiscussion ref="DeitDiscussion">
-  </deitDiscussion>
+    </deitDiscussion>
   </basic-container>
- 
+
 </template>
 
 <script>
-import {
-  historyFlowList,
-  leaveDetail
-} from "@/api/work/process";
-import {
-  getList,
-  remove,
-  update,
-  add,
-  getPropertyCapitalApply
-} from "@/api/property/propertyCapitalApply";
+  import {
+    historyFlowList,
+    leaveDetail
+  } from "@/api/work/process";
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getPropertyCapitalApply
+  } from "@/api/property/propertyCapitalApply";
 
-import {
-  getLists
-} from "@/api/discuss/topics"
-import deitDiscussion from "../../components/deitDiscussion.vue"
-export default {
-  components: {
-    deitDiscussion
-  },
-  data() {
-    return {
-      businessId: '',
-      processInstanceId: '',
-      src: '',
-      flowList: [],
-      form: {
-        flow: {
-          assigneeName: '',
-        },
-        startTime: '',
-        endTime: '',
-        reason: '',
-      },
-      option: {
-        height: "auto",
-        calcHeight: 54,
-        dialogWidth: 1150,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 3,
-        menuWidth: 350,
-        border: true,
-        //stripe:true,
-        submitBtn: false,
-        emptyBtn: false,
-        index: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [{
-          label: "小区",
-          prop: "districtId",
-          searchSpan: 5,
-          search: true,
-          type: 'tree',
-          dicUrl: `/api/blade-district/district/getDistrictTree`,
-          cascader: ['articleId'],
-          props: {
-            label: "name",
-            value: "id"
+  import {
+    getLists
+  } from "@/api/discuss/topics"
+  import deitDiscussion from "../../components/deitDiscussion.vue"
+  export default {
+    components: {
+      deitDiscussion
+    },
+    data() {
+      return {
+        businessId: '',
+        processInstanceId: '',
+        src: '',
+        flowList: [],
+        form: {
+          flow: {
+            assigneeName: '',
           },
-          defaultExpandedKeys: ["361102003"],
-          span: 12,
-          labelWidth: 120,
-          width: 220,
-          overHidden: true,
-          rules: [{
-            required: true,
-            message: "请选择小区",
-            trigger: "blur",
-          },],
-          disabled: true
+          startTime: '',
+          endTime: '',
+          reason: '',
         },
-        {
-          label: '维修项目名称',
-          prop: 'name',
-          searchLabelWidth: 120,
-          searchSpan: 5,
-          search: true,
-          span: 12,
-          labelWidth: 140,
-          rules: [{
-            required: true,
-            message: "请输入维修项目名称",
-            trigger: "blur",
-          },],
-          disabled: true
-        },
-        {
-          label: "预计开工时间",
-          prop: "runTime",
-          span: 12,
-          labelWidth: 140,
-          type: "date",
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd",
-          rules: [{
-            required: true,
-            message: "请选择合同开始时间",
-            trigger: "blur",
-          },],
-          disabled: true
-        },
-        {
-          label: "预计竣工时间",
-          prop: "completedTime",
-          labelWidth: 140,
-          span: 12,
-          type: "date",
-          format: "yyyy-MM-dd",
-          valueFormat: "yyyy-MM-dd",
-          rules: [{
-            required: true,
-            message: "请选择合同结束时间",
-            trigger: "blur",
-          },],
-          disabled: true
-        },
-        {
-          label: "项目分摊方式",
-          prop: "allocationWay",
-          labelWidth: 140,
-          value: '按建筑面积分摊',
-          span: 12,
-          row: true,
-          disabled: true
-        },
-        {
-          label: '联系人',
-          prop: 'linkman',
-          span: 12,
-          labelWidth: 120,
-          search: true,
-          searchSpan: 4,
-          rules: [{
-            required: true,
-            message: "请输入联系人",
-            trigger: "blur",
-          },],
-          disabled: true
-        },
-        {
-          label: '联系方式',
-          prop: 'linkPhone',
-          span: 12,
-          labelWidth: 140,
-          rules: [{
-            required: true,
-            message: "请输入联系方式",
-            trigger: "blur",
-          },],
-          disabled: true
-        },
-        {
-          label: "项目预算总金额(元)",
-          prop: "budgetAmount",
-          span: 12,
-          hide: true,
-          labelWidth: 140,
-          type: 'number',
-          precision: 2,
-          value: '0.00',
-          disabled: true
-        },
-        {
-          label: "实际预算金额(元)",
-          prop: "actualAmount",
-          span: 12,
-          hide: true,
-          labelWidth: 140,
-          type: 'number',
-          precision: 2,
-          value: '0.00',
-          disabled: true
-        },
-        {
-          label: "自筹金额(元)",
-          prop: "selfAmount",
-          span: 12,
-          hide: true,
-          labelWidth: 140,
-          type: 'number',
-          precision: 2,
-          value: '0.00',
-          disabled: true
-        },
-        {
-          label: "预算应拨付金额(元)",
-          prop: "budgetAppropriateAmount",
-          span: 12,
-          hide: true,
-          labelWidth: 140,
-          type: 'number',
-          precision: 2,
-          value: '0.00',
-          disabled: true
-        },
-        {
-          disabled:true,
-          display: false,
-          hide: true,
-          parent: false,
-          label: "投票结果",
-          prop: "articleId",
-          search: false,
-          viewDisabled: false,
-          type: 'select',
-          dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{districtId}}`,
-          cascader: ['vote'],
-          props: {
-            label: "title",
-            value: "id"
-          },
-          defaultExpandedKeys: ["361102003"],
-          span: 12,
-          labelWidth:140,
-          rules: [{
-            required: true,
-            message: "请选择投票结果",
-            trigger: "blur",
-          },],
-          change: (val) => {
-            console.log("val===>", val)
-            // console.log("form===>",this.form)
-            if (val.value && !this.form.id) {
-              this.articleRange = val.articleRange;
-              // this.showDialog = true;
-              // this.getDetail(val.value, val.articleRange)
+        option: {
+          height: "auto",
+          calcHeight: 54,
+          dialogWidth: 1150,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 3,
+          menuWidth: 350,
+          border: true,
+          //stripe:true,
+          submitBtn: false,
+          emptyBtn: false,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [{
+              label: "小区",
+              prop: "districtId",
+              searchSpan: 5,
+              search: true,
+              type: 'tree',
+              dicUrl: `/api/blade-district/district/getDistrictTree`,
+              cascader: ['articleId'],
+              props: {
+                label: "name",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+              labelWidth: 120,
+              width: 220,
+              overHidden: true,
+              rules: [{
+                required: true,
+                message: "请选择小区",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: '维修项目名称',
+              prop: 'name',
+              searchLabelWidth: 120,
+              searchSpan: 5,
+              search: true,
+              span: 12,
+              labelWidth: 140,
+              rules: [{
+                required: true,
+                message: "请输入维修项目名称",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: "预计开工时间",
+              prop: "runTime",
+              span: 12,
+              labelWidth: 140,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请选择合同开始时间",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: "预计竣工时间",
+              prop: "completedTime",
+              labelWidth: 140,
+              span: 12,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请选择合同结束时间",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: "楼栋",
+              prop: "buildingName",
+              labelWidth: 140,
+              value: '',
+              span: 12,
+              row: true,
+              disabled: true
+            },
+            {
+              label: '联系人',
+              prop: 'linkman',
+              span: 12,
+              labelWidth: 120,
+              search: true,
+              searchSpan: 4,
+              rules: [{
+                required: true,
+                message: "请输入联系人",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: '联系方式',
+              prop: 'linkPhone',
+              span: 12,
+              labelWidth: 140,
+              rules: [{
+                required: true,
+                message: "请输入联系方式",
+                trigger: "blur",
+              }, ],
+              disabled: true
+            },
+            {
+              label: "项目预算总金额(元)",
+              prop: "budgetAmount",
+              span: 12,
+              hide: true,
+              labelWidth: 140,
+              type: 'number',
+              precision: 2,
+              value: '0.00',
+              disabled: true
+            },
+            {
+              label: "实际预算金额(元)",
+              prop: "actualAmount",
+              span: 12,
+              hide: true,
+              labelWidth: 140,
+              type: 'number',
+              precision: 2,
+              value: '0.00',
+              disabled: true
+            },
+            {
+              label: "自筹金额(元)",
+              prop: "selfAmount",
+              span: 12,
+              hide: true,
+              labelWidth: 140,
+              type: 'number',
+              precision: 2,
+              value: '0.00',
+              disabled: true
+            },
+            {
+              label: "预算应拨付金额(元)",
+              prop: "budgetAppropriateAmount",
+              span: 12,
+              hide: true,
+              labelWidth: 140,
+              type: 'number',
+              precision: 2,
+              value: '0.00',
+              disabled: true
+            },
+            {
+              disabled: true,
+              display: false,
+              hide: true,
+              parent: false,
+              label: "投票结果",
+              prop: "articleId",
+              search: false,
+              viewDisabled: false,
+              type: 'select',
+              dicUrl: `/api/blade-article/article/getArticleByDistrictId?type=4&eventType=1&districtId={{districtId}}`,
+              cascader: ['vote'],
+              props: {
+                label: "title",
+                value: "id"
+              },
+              defaultExpandedKeys: ["361102003"],
+              span: 12,
+              labelWidth: 140,
+              rules: [{
+                required: true,
+                message: "请选择投票结果",
+                trigger: "blur",
+              }, ],
+              change: (val) => {
+                console.log("val===>", val)
+                // console.log("form===>",this.form)
+                if (val.value && !this.form.id) {
+                  this.articleRange = val.articleRange;
+                  // this.showDialog = true;
+                  // this.getDetail(val.value, val.articleRange)
+                }
+
+              }
+            },
+
+            {
+              disabled: true,
+              display: false,
+              span: 24,
+              hide: true,
+              prop: "vote",
+              slot: true,
+              label: "投票详情",
+              labelWidth: 140,
+
+            },
+
+            {
+              label: "项目摘要",
+              span: 24,
+              hide: true,
+              prop: "projectDigest",
+              placeholder: "例如:“XX小区XX栋XX设施设备维修,总的预算金额是X,是否含有审价,本次维修涉及范围共XX户,总面积的建筑面积为XX平方米”",
+              labelWidth: 140,
+              type: "textarea",
+              disabled: true
+            },
+            {
+              label: "项目进度描述",
+              span: 24,
+              hide: true,
+              prop: "projectDescribe",
+              labelWidth: 140,
+              type: "textarea",
+              disabled: true
+            },
+            {
+              label: '施工方案附件',
+              prop: 'constructionSchemeUrls',
+              type: 'upload',
+              span: 24,
+              hide: true,
+              labelWidth: 140,
+              multiple: true,
+              // showFileList: true,
+              propsHttp: {
+                res: 'data',
+                name: "originalName",
+                url: "link"
+              },
+              action: '/api/blade-resource/oss/endpoint/put-file-attach',
+              rules: [{
+                required: true,
+                message: "请上传施工方案",
+                trigger: "blur",
+              }, ],
             }
+          ],
+        },
+        topictData: [],
+        topicTitle: "",
+        articleRange: ""
+      }
+    },
 
+    watch: {
+      'form.districtId': {
+        handler(newData) {
+          const column = this.findObject(this.option.column, "articleId")
+          if (newData && this.form.articleId) {
+            column.display = true;
+          } else {
+            column.display = false
           }
-        },
-
-        {
-          disabled: true,
-          display: false,
-          span: 24,
-          hide: true,
-          prop: "vote",
-          slot: true,
-          label: "投票详情",
-          labelWidth: 140,
-
-        },
-
-        {
-          label: "项目摘要",
-          span: 24,
-          hide: true,
-          prop: "projectDigest",
-          placeholder: "例如:“XX小区XX栋XX设施设备维修,总的预算金额是X,是否含有审价,本次维修涉及范围共XX户,总面积的建筑面积为XX平方米”",
-          labelWidth: 140,
-          type: "textarea",
-          disabled: true
-        },
-        {
-          label: "项目进度描述",
-          span: 24,
-          hide: true,
-          prop: "projectDescribe",
-          labelWidth: 140,
-          type: "textarea",
-          disabled: true
-        },
-        {
-          label: '施工方案附件',
-          prop: 'constructionSchemeUrls',
-          type: 'upload',
-          span: 24,
-          hide: true,
-          labelWidth: 140,
-          multiple: true,
-          // showFileList: true,
-          propsHttp: {
-            res: 'data',
-            name: "originalName",
-            url: "link"
-          },
-          action: '/api/blade-resource/oss/endpoint/put-file-attach',
-          rules: [{
-            required: true,
-            message: "请上传施工方案",
-            trigger: "blur",
-          },],
         }
-        ],
       },
-      topictData: [],
-      topicTitle: "",
-      articleRange: ""
+
+
+      'form.articleId': {
+        handler(newData) {
+          this.getVoteDetail(this.form.articleId, this.articleRange)
+          const column = this.findObject(this.option.column, "vote")
+          if (newData) {
+            column.display = true;
+          } else {
+            column.display = false
+          }
+        }
+      },
+
+    },
+
+
+
+    created() {
+      this.init();
+    },
+    methods: {
+      init() {
+        this.processInstanceId = this.$route.params.processInstanceId;
+        this.businessId = this.$route.params.businessId;
+        historyFlowList(this.processInstanceId).then(res => {
+          const data = res.data;
+          if (data.success) {
+            this.flowList = data.data;
+          }
+        })
+        getPropertyCapitalApply(this.businessId).then(res => {
+          const data = res.data;
+          if (data.success) {
+            this.form = data.data;
+          }
+        })
+      },
+      handleCancel() {
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: `/work/start`
+        });
+      },
+
+      getVoteDetail(articleId, districtId) {
+        let params = {
+          level: 1,
+          articleId: articleId,
+          districtId: districtId
+        }
+        getLists(1, 10, params).then(res => {
+          const data = res.data.data
+          if (data.length) {
+            this.topictData = data[0].children;
+            this.topicTitle = data[0].discussContent;
+          }
+        })
+      },
+
+      openUserPopup(row) {
+        this.$refs.DeitDiscussion.openUser(row, 1, [this.form.districtId])
+      },
     }
-  },
-
-  watch: {
-    'form.districtId': {
-      handler(newData) {
-        const column = this.findObject(this.option.column, "articleId")
-        if (newData && this.form.articleId) {
-          column.display = true;
-        } else {
-          column.display = false
-        }
-      }
-    },
-
-
-    'form.articleId': {
-      handler(newData) {
-        this.getVoteDetail(this.form.articleId, this.articleRange)
-        const column = this.findObject(this.option.column, "vote")
-        if (newData) {
-          column.display = true;
-        } else {
-          column.display = false
-        }
-      }
-    },
-
-  },
-
-
-
-  created() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.processInstanceId = this.$route.params.processInstanceId;
-      this.businessId = this.$route.params.businessId;
-      historyFlowList(this.processInstanceId).then(res => {
-        const data = res.data;
-        if (data.success) {
-          this.flowList = data.data;
-        }
-      })
-      getPropertyCapitalApply(this.businessId).then(res => {
-        const data = res.data;
-        if (data.success) {
-          this.form = data.data;
-        }
-      })
-    },
-    handleCancel() {
-      this.$router.$avueRouter.closeTag();
-      this.$router.push({
-        path: `/work/start`
-      });
-    },
-
-    getVoteDetail(articleId, districtId) {
-      let params = {
-        level: 1,
-        articleId: articleId,
-        districtId: districtId
-      }
-      getLists(1, 10, params).then(res => {
-        const data = res.data.data
-        if (data.length) {
-          this.topictData = data[0].children;
-          this.topicTitle = data[0].discussContent;
-        }
-      })
-    },
-
-    openUserPopup(row) {
-      this.$refs.DeitDiscussion.openUser(row, 1, [this.form.districtId])
-    },
   }
-}
 </script>
 
 
 <style>
-
-
-.workOrderStyle {
-  font-weight: normal;
-}
-</style>
\ No newline at end of file
+  .workOrderStyle {
+    font-weight: normal;
+  }
+</style>

--
Gitblit v1.9.3