feat: There is no way the, bug xx

2022-04-04 20:46:14 +08:00
parent 3d4d1ddc52
commit ec401d0c19
3 changed files with 127 additions and 83 deletions
@@ -417,14 +417,14 @@
                            placeholder="请输入发文单位"
                            clearable></el-input>
                </el-form-item>
-                <el-form-item label="征集意见周期" prop="commentCycleDate" label-width="150px" class="add-form-item">
+                <el-form-item label="征集意见周期" prop="commentCycleDate2" label-width="150px" class="add-form-item">
                  <el-date-picker
-                          v-model="sarLawsStandEO.commentCycleDate"
-                          type="datetimerange"
+                          v-model="commentCycleDate2"
                          :picker-options="pickerOptions"
+                          type="daterange"
                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="起始时间"
+                          end-placeholder="结束时间"
                          value-format="yyyy-MM-dd"
                          align="right">
                  </el-date-picker>
@@ -1030,11 +1030,11 @@
                <el-form-item label="征集意见周期" title="征集意见周期" class="add-form-item form-item-disabled">
                  <el-date-picker
                          v-model="commentCycleDate"
-                          type="datetimerange"
                          :picker-options="pickerOptions"
+                          type="daterange"
                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
+                          start-placeholder="起始时间"
+                          end-placeholder="结束时间"
                          value-format="yyyy-MM-dd"
                          align="right">
                  </el-date-picker>
@@ -1921,6 +1921,7 @@
        goSearch: '',
        SarExportSearchEo: {},
        commentCycleDate:'',
+        commentCycleDate2:'',
        lawsStandInfoSearch: {
          orgName: '', // 部门名称
          page: 1,
@@ -2855,77 +2856,102 @@
        })
        window.open(routeUrl.href, '_blank')
      },
+      filterObj(obj){
+            if(obj && obj !== ''){
+                if(obj instanceof Array){
+                    return obj;
+                }else {
+                    return obj.split(",")
+                }
+            }
+            return "";
+        },
      // 编辑
      selectStandardPro (row, state) {
        this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: row.id}, {
          _this: this
        }, res => {
-          const item = res.data || {}
-          this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
-          console.log(this.sarLawsStandEO)
-          this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
-          let subClass = item.standSubclass
-          this.sarLawsStandEO.standSubclass = subClass
-          if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
-            this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
-          }
-          if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
-            this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
-          }
-          Object.keys(item.attrInfoMap || {}).forEach((key) => {
-            if (item.attrInfoMap[key]) {
-              // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
-              this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
-            }
-          })
-          this.sarLawsStandEO['id'] = item.id
-          this.drawerTitle = '修改政策标准'
-          this.modalshowflag = true
-          this.resolveFormFieldList(true)
-          this.$nextTick(() => {
-            Promise.all([this.queryDisplayLocation()]).then((values) => {
-              const [displayLocation] = values
-              const dynamicFormField = this.sarLawsStandEO
-              const formFieldList = this.formFieldList
-              formFieldList.forEach((field) => {
-                displayLocation.forEach((location) => {
-                  let value = dynamicFormField[field.attrField]
-                  let valueName = ''
-                  if (value && typeof value === 'number') {
-                    value = this.$dateFormat(value, 'yyyy-MM-dd')
+          if(res.data){
+              const item = res.data || {}
+              this.sarLawsStandEO = JSON.parse(JSON.stringify(item))
+              this.sarLawsStandEO['lawsSyqy'] = this.filterObj(this.sarLawsStandEO['lawsSyqy'])
+              this.sarLawsStandEO['lawsSycx'] = this.filterObj(this.sarLawsStandEO['lawsSycx'])
+              this.sarLawsStandEO['lawsLabel'] = this.filterObj(this.sarLawsStandEO['lawsLabel'])
+              this.sarLawsStandEO['YYRZLAWS'] = this.filterObj(this.sarLawsStandEO['YYRZLAWS'])
+              this.sarLawsStandEO['NYLXLAWS'] = this.filterObj(this.sarLawsStandEO['NYLXLAWS'])
+              this.sarLawsStandEO['TGRLAWS'] = this.filterObj(this.sarLawsStandEO['TGRLAWS'])
+              this.sarLawsStandEO['ZRBMLAWS'] = this.filterObj(this.sarLawsStandEO['ZRBMLAWS'])
+              this.sarLawsStandEO['TGDWLAWS'] = this.filterObj(this.sarLawsStandEO['TGDWLAWS'])
+              const dateArr = []
+              if(this.sarLawsStandEO.commentCycleStart && this.sarLawsStandEO.commentCycleEnd){
+                  dateArr[0] = this.sarLawsStandEO.commentCycleStart
+                  dateArr[1] = this.sarLawsStandEO.commentCycleEnd
+                  this.commentCycleDate2 = dateArr
+              }
+              this.sarLawsStandEO["XCSJBUSS"] = this.dateFormatter()
+              let subClass = item.standSubclass
+              this.sarLawsStandEO.standSubclass = subClass
+              if (this.sarLawsStandEO.issueTime != null && this.sarLawsStandEO.issueTime !== '') {
+                  this.sarLawsStandEO.issueTime = new Date(this.sarLawsStandEO.issueTime)
+              }
+              if (this.sarLawsStandEO.putTime != null && this.sarLawsStandEO.putTime !== '') {
+                  this.sarLawsStandEO.putTime = new Date(this.sarLawsStandEO.putTime)
+              }
+              Object.keys(item.attrInfoMap || {}).forEach((key) => {
+                  if (item.attrInfoMap[key]) {
+                      // this.sarStandardsInfoEO[key] = item.attrInfoMap[key]
+                      this.$set(this.sarLawsStandEO, key, item.attrInfoMap[key])
                  }
-                  field['value'] = value
-                  // 追加用户名称和部门名称
-                  if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') {
-                    let attrFieldName = field.attrField + 'Name'
-                    valueName = dynamicFormField[attrFieldName]
-                  }
-                  field['valueName'] = valueName
-                  if (field.showRegionId === location.value) {
-                    if (!location.child) {
-                      location['child'] = []
-                    }
-                    location['child'].push(field)
-                  }
-                })
              })
-              this.dynamicFormField = displayLocation
-              this.loading = false
-            })
-            if (state === 'show') {
-              this.formdisableflag = true
-            } else {
-              // this.standGeneraSelectChange() // 负责细类初始化
-              //   this.getOrgTreeSource()
-              this.addOrUPdateFlag = 2
-              this.formdisableflag = false
-              this.saveOldNum = item.standCode // 记录修改之前的标准编号
-              this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
-              // let selectNode = this.getTreeNameByid(this.sarLawsStandEO.responsibleUnit)
-              this.sarLawsStandEO.orgName = item.responsibleUnitShow
-            }
-          })
-          console.log(this.sarLawsStandEO)
+              this.sarLawsStandEO['id'] = item.id
+              this.drawerTitle = '修改政策标准'
+              this.modalshowflag = true
+              this.resolveFormFieldList(true)
+              this.$nextTick(() => {
+                  Promise.all([this.queryDisplayLocation()]).then((values) => {
+                      const [displayLocation] = values
+                      const dynamicFormField = this.sarLawsStandEO
+                      const formFieldList = this.formFieldList
+                      formFieldList.forEach((field) => {
+                          displayLocation.forEach((location) => {
+                              let value = dynamicFormField[field.attrField]
+                              let valueName = ''
+                              if (value && typeof value === 'number') {
+                                  value = this.$dateFormat(value, 'yyyy-MM-dd')
+                              }
+                              field['value'] = value
+                              // 追加用户名称和部门名称
+                              if (field.selVal === 'ORGLIST' || field.selVal === 'USERLIST' || field.attrField === 'SVPPS') {
+                                  let attrFieldName = field.attrField + 'Name'
+                                  valueName = dynamicFormField[attrFieldName]
+                              }
+                              field['valueName'] = valueName
+                              if (field.showRegionId === location.value) {
+                                  if (!location.child) {
+                                      location['child'] = []
+                                  }
+                                  location['child'].push(field)
+                              }
+                          })
+                      })
+                      this.dynamicFormField = displayLocation
+                      this.loading = false
+                  })
+                  if (state === 'show') {
+                      this.formdisableflag = true
+                  } else {
+                      // this.standGeneraSelectChange() // 负责细类初始化
+                      //   this.getOrgTreeSource()
+                      this.addOrUPdateFlag = 2
+                      this.formdisableflag = false
+                      this.saveOldNum = item.standCode // 记录修改之前的标准编号
+                      this.saveOldReplaceNum = item.replaceStandNum // 记录修改之前的代替标准编号
+                      // let selectNode = this.getTreeNameByid(this.sarLawsStandEO.responsibleUnit)
+                      this.sarLawsStandEO.orgName = item.responsibleUnitShow
+                  }
+              })
+              this.$forceUpdate()
+          }
        })
      },
      // 部门树结构，通过id，查出对应的树节点
@@ -3024,6 +3050,10 @@
                  }else {
                    nowstandinfo["lawsLabel"] = "";
                  }
+                    if(this.commentCycleDate2 && this.commentCycleDate2.length > 0){
+                        nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
+                        nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
+                    }
                  this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
                    _this: this,
                    loading: 'isSubmit'
@@ -3061,6 +3091,10 @@
                  }else {
                    nowstandinfo["lawsLabel"] = "";
                  }
+                    if(this.commentCycleDate2 && this.commentCycleDate2.length > 0){
+                        nowstandinfo.commentCycleStart = this.commentCycleDate2[0]
+                        nowstandinfo.commentCycleEnd = this.commentCycleDate2[1]
+                    }
                  this.$http.postData('lawss/sarLawsInfo/updateSarLawsStandInfo', nowstandinfo, {
                    _this: this,
                    loading: 'isSubmit'