bug

src/router/index.js

@@ -398,6 +398,11 @@ export const constantRoutes = [
         component: () => import('@/views/life-line/components/mapCharts/mapEchartsNew.vue'),
         hidden: false
     },
+    {
+        path: '/workflow/myProcess',
+        component: () => import('@/views/workflow/myProcess.vue'),
+        hidden: true
+    }
 
 ]
 

src/views/buyingBack/index.vue

@@ -181,7 +181,6 @@ export default {
                 this.baseRequest('delete', { id: val.id }).then(res => {
                     if (res.data.code == 200) {
                         this.getData()
-                        this.getTreeData()
                         this.$message({
                             type: 'success',
                             message: '删除成功!'

src/views/buyingMore/buyingMoreAdd.vue

@@ -79,7 +79,7 @@
             <el-row>
               <el-col :span="4" class="col-txt"><span>转让份额</span></el-col>
               <el-col :span="20" class="col-input">
-                <el-form-item>
+                <el-form-item prop="transferProportion">
                   <el-input v-model="form.transferProportion" @input="proportionChange" />
                 </el-form-item>
               </el-col>
@@ -87,7 +87,7 @@
             <el-row>
               <el-col :span="4" class="col-txt"><span>转让后买受人产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
-                <el-form-item>
+                <el-form-item prop="transferBuyerProportionAfter">
                   <el-input v-model="form.transferBuyerProportionAfter" readonly />
                 </el-form-item>
               </el-col>
@@ -95,7 +95,7 @@
             <el-row>
               <el-col :span="4" class="col-txt"><span>转让后安居公司产权份额占比为（%）</span></el-col>
               <el-col :span="20" class="col-input">
-                <el-form-item>
+                <el-form-item prop="transferCompanyProportionAfter">
                   <el-input v-model="form.transferCompanyProportionAfter" readonly />
                 </el-form-item>
               </el-col>
@@ -199,7 +199,12 @@ export default {
         return {
             dc_key: ['TRANSFER_PROPORTION'],
             form: {},
-            rules: {},
+            rules: {
+                serialNumber: [{ required: true, message: '请输入编号', trigger: 'blur' }],
+                transferProportion: [{ required: true, message: '请输入转让份额', trigger: 'blur' }],
+                transferBuyerProportionAfter: [{ required: true, message: '请输入转让后买受人产权份额占比', trigger: 'change' }],
+                transferCompanyProportionAfter: [{ required: true, message: '请输入转让后安居公司产权份额占比', trigger: 'change' }]
+            },
             dialogVisible: false,
             dialogTitle: '',
             isView: false,
@@ -243,23 +248,32 @@ export default {
         },
         confirmSubmit() {
             const _this = this
-            _this.loadingFlag = true
-            const soaUrl = 'add'
-            const extraData = {
-                type: '1'
+            if (!_this.form.contractId) {
+                _this.$message.warning('请选择合同')
+                return
             }
-            const postData = Object.assign({}, _this.form, extraData)
-            this.baseRequest(soaUrl, postData).then(res => {
-                if (res.data.code === 200) {
-                    this.$message.success('保存成功')
-                    this.cancel()
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    _this.loadingFlag = true
+                    const soaUrl = 'add'
+                    const extraData = {
+                        type: '1'
+                    }
+                    const postData = Object.assign({}, _this.form, extraData)
+                    this.baseRequest(soaUrl, postData).then(res => {
+                        if (res.data.code === 200) {
+                            this.$message.success('保存成功')
+                            this.cancel()
+                        } else {
+                            this.$message.error(res.data.msg)
+                        }
+                        _this.loadingFlag = false
+                    }).catch(err => {
+                        _this.loadingFlag = false
+                    })
                 } else {
-                    this.$message.error(res.data.msg)
+                    return false
                 }
-                _this.loadingFlag = false
-            }).catch(err => {
-                // this.$message.error(err)
-                _this.loadingFlag = false
             })
         },
         handleContract() {

src/views/buyingMore/index.vue

@@ -181,7 +181,6 @@ export default {
                 this.baseRequest('delete', { id: val.id }).then(res => {
                     if (res.data.code == 200) {
                         this.getData()
-                        this.getTreeData()
                         this.$message({
                             type: 'success',
                             message: '删除成功!'

src/views/customerManagement/numberManagement/addCustomer.vue

@@ -187,7 +187,7 @@ export default {
             this.isView = data.isView
             this.initDict(this.dc_key).then(res => {
                 if (data.id) {
-                    this.getById()
+                    this.getById(data.id)
                 }
             })
         },

src/views/customerManagement/numberManagement/index.vue

@@ -487,10 +487,11 @@ export default {
             this.groupOption = []
             this.baseParkRequest('listAll', {}).then(res => {
                 if (res.data) {
-                    const idArr = res.data.map(obj => { return obj.id })
+                    // const idArr = res.data.map(obj => { return obj.id })
                     this.groupOption.push({
                         label: '全部',
-                        value: idArr.join(',')
+                        // value: idArr.join(',')
+                        value: ''
                     })
                     res.data.forEach(item => {
                         const obj = {
@@ -512,10 +513,11 @@ export default {
             }
             this.baseFQRequest('listAll', data).then(res => {
                 if (res.data) {
-                    const idArr = res.data.map(obj => { return obj.id })
+                    // const idArr = res.data.map(obj => { return obj.id })
                     this.discOption.push({
                         label: '全部',
-                        value: idArr.join(',')
+                        // value: idArr.join(',')
+                        value: ''
                     })
                     res.data.forEach(item => {
                         const obj = {

src/views/login/index.vue

@@ -416,8 +416,8 @@ export default {
                                 } else {
                                     Cookie.remove('username')
                                 }
-                                // this.$router.push({ path: '/homeLand' })
-                                this.$router.push({ path: '/backstage?menuIndex=1281203683157082112' })
+                                this.$router.push({ path: '/workbench' })
+                                // this.$router.push({ path: '/backstage?menuIndex=1281203683157082112' })
                                 // window.localStorage.setItem('mask_status', true)
                                 this.loading = false
                             } else {

src/views/parkAssets/parkFloorDisc/index.vue

@@ -99,13 +99,13 @@
             <!--            <span class="card_title">基本信息</span>-->
             <el-card shadow="always" style="padding-top: 10px">
               <el-row>
-                <el-col :span="4" class="col-txt"><span>*楼盘/小区名称</span></el-col>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>楼盘/小区名称</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item prop="groupName">
                     <el-input v-model="groupForm.groupName" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" class="col-txt"><span>*性质</span></el-col>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>性质</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item prop="nature">
                     <el-select
@@ -126,7 +126,7 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>*预销售许可证编号:</span></el-col>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>预销售许可证编号:</span></el-col>
                 <el-col :span="8" class="col-input">
                   <el-form-item prop="preSalesLicenseNumber">
                     <el-input v-model="groupForm.preSalesLicenseNumber" />
@@ -323,15 +323,15 @@
       :modal-append-to-body="true"
       custom-class="tagdialog"
     >
-      <el-form ref="commitForm" :model="formLP" style="width: 100%;padding: 5px" :rules="commitRules">
+      <el-form ref="formLP" :model="formLP" style="width: 100%;padding: 5px" :rules="commitRules">
         <el-row>
           <el-col style="padding-bottom: 10px">
             <!--            <span class="card_title">基本信息</span>-->
             <el-card shadow="always" style="padding-top: 10px">
               <el-row>
-                <el-col :span="4" class="col-txt"><span>楼盘/小区名称</span></el-col>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>楼盘/小区名称</span></el-col>
                 <el-col :span="20" class="col-input">
-                  <el-form-item>
+                  <el-form-item prop="groupId">
                     <el-select
                       v-model="formLP.groupId"
                       placeholder=""
@@ -349,9 +349,9 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>分期名称</span></el-col>
+                <el-col :span="4" class="col-txt"><span><span class="red-asterisk">*</span>分期名称</span></el-col>
                 <el-col :span="20" class="col-input">
-                  <el-form-item>
+                  <el-form-item prop="name">
                     <el-input v-model="formLP.name" />
                   </el-form-item>
                 </el-col>
@@ -396,30 +396,30 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-<!--              <el-row>-->
-<!--                <el-col :span="4" class="col-txt"><span>支付方式</span></el-col>-->
-<!--                <el-col :span="20" class="col-input">-->
-<!--                  <el-form-item>-->
-<!--                    <el-select-->
-<!--                      v-model="formLP.paymentMethods"-->
-<!--                      placeholder=""-->
-<!--                      filterable-->
-<!--                      clearable-->
-<!--                      :popper-append-to-body="false"-->
-<!--                      popper-class="statistic_base"-->
-<!--                    >-->
-<!--                      <el-option-->
-<!--                        v-for="item in dc_data.PAYMENT_METHODS"-->
-<!--                        :key="item.id"-->
-<!--                        :label="item.label"-->
-<!--                        :value="item.value"-->
-<!--                        :popper-append-to-body="false"-->
-<!--                        popper-class="statistic_base"-->
-<!--                      />-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-row>-->
+              <!--              <el-row>-->
+              <!--                <el-col :span="4" class="col-txt"><span>支付方式</span></el-col>-->
+              <!--                <el-col :span="20" class="col-input">-->
+              <!--                  <el-form-item>-->
+              <!--                    <el-select-->
+              <!--                      v-model="formLP.paymentMethods"-->
+              <!--                      placeholder=""-->
+              <!--                      filterable-->
+              <!--                      clearable-->
+              <!--                      :popper-append-to-body="false"-->
+              <!--                      popper-class="statistic_base"-->
+              <!--                    >-->
+              <!--                      <el-option-->
+              <!--                        v-for="item in dc_data.PAYMENT_METHODS"-->
+              <!--                        :key="item.id"-->
+              <!--                        :label="item.label"-->
+              <!--                        :value="item.value"-->
+              <!--                        :popper-append-to-body="false"-->
+              <!--                        popper-class="statistic_base"-->
+              <!--                      />-->
+              <!--                    </el-select>-->
+              <!--                  </el-form-item>-->
+              <!--                </el-col>-->
+              <!--              </el-row>-->
               <el-row>
                 <el-col :span="4" class="col-txt"><span>户型库</span></el-col>
               </el-row>
@@ -552,8 +552,8 @@ export default {
                 preSalesLicenseNumber: [{ required: true, trigger: 'blur', message: '请输入预销售许可证编号' }]
             },
             commitRules: {
-                size: [{ required: true, trigger: 'blur', message: '请输入面积' }],
-                address: [{ required: true, trigger: 'blur', message: '请输入地址' }]
+                groupId: [{ required: true, trigger: 'change', message: '请选择小区' }],
+                name: [{ required: true, trigger: 'blur', message: '请输入分期名称' }]
             },
             companyOptions: [],
             dialogVisible: false,
@@ -721,27 +721,31 @@ export default {
         },
         confirmFQSubmit: function() {
             const _this = this
-            const extraData = {
-                houseTypeStr: JSON.stringify(_this.formLP.dynamicItem)
-            }
-            const postData = Object.assign({}, _this.formLP, extraData)
-            let url
-            if (_this.formLP.id) {
-                url = 'edit'
-            } else {
-                url = 'add'
-            }
-            this.baseFQRequest(url, postData).then((res) => {
-                if (res.data.code == 200) {
-                    this.dialogFQVisible = false
-                    this.getData()
-                    this.getTreeData()
-                    this.$message({
-                        message: '提交成功',
-                        type: 'success'
+            this.$refs.formLP.validate(valid => {
+                if (valid) {
+                    const extraData = {
+                        houseTypeStr: JSON.stringify(_this.formLP.dynamicItem)
+                    }
+                    const postData = Object.assign({}, _this.formLP, extraData)
+                    let url
+                    if (_this.formLP.id) {
+                        url = 'edit'
+                    } else {
+                        url = 'add'
+                    }
+                    this.baseFQRequest(url, postData).then((res) => {
+                        if (res.data.code == 200) {
+                            this.dialogFQVisible = false
+                            this.getData()
+                            this.getTreeData()
+                            this.$message({
+                                message: '提交成功',
+                                type: 'success'
+                            })
+                        }
+                    }).catch(() => {
                     })
                 }
-            }).catch(() => {
             })
         },
 
@@ -973,4 +977,7 @@ export default {
         background-color: #98CC1F;
         color: #fff;
     }
+    .red-asterisk {
+        color: red;
+    }
 </style>