修改

BIZ/jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/controller/QcSsgqzysytdqkController.java

@@ -775,6 +775,73 @@ public class QcSsgqzysytdqkController extends JeecgController<QcSsgqzysytdqk, IQ
         return Result.OK("编辑成功!");
     }
 
+
+    /**
+     * 编辑
+     *
+     * @param qcSsgqzysytdqk
+     * @return
+     */
+    @AutoLog(value = "省属国企占有使用土地情况调查-编辑")
+    @ApiOperation(value = "省属国企占有使用土地情况调查-编辑", notes = "省属国企占有使用土地情况调查-编辑")
+    @RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit1(@RequestBody QcSsgqzysytdqk qcSsgqzysytdqk) {
+        //当输入的为亩时
+        if (qcSsgqzysytdqk.getSfsb() == 3) {
+            if (qcSsgqzysytdqk.getSjzytdmjdw().equals("1")) {
+                qcSsgqzysytdqk.setSjzytdmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjPf(Zh.MzP(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjM(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjM(qcSsgqzysytdqk.getQzpzsymj());
+            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("2")) {//当输入的为公顷时
+                qcSsgqzysytdqk.setSjzytdmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjM(Zh.GqZm(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjGq(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjGq(qcSsgqzysytdqk.getQzpzsymj());
+            } else if (qcSsgqzysytdqk.getSjzytdmjdw().equals("3")) {//当输入的为平方米时
+                qcSsgqzysytdqk.setSjzytdmjM(Zh.PzM(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjzytdmj()));
+                qcSsgqzysytdqk.setSjzytdmjPf(qcSsgqzysytdqk.getSjzytdmj());
+                qcSsgqzysytdqk.setQzpztdmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj()));
+                qcSsgqzysytdqk.setQzpztdmjPf(qcSsgqzysytdqk.getQzpzsymj());
+            }
+            if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("1")) {//当输入的为亩时
+                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.MzP(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjM(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.MzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.MzP(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjM(qcSsgqzysytdqk.getQzpzsymj2());
+            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("2")) {//当输入的为公顷时
+                qcSsgqzysytdqk.setSjsyjzmjM(Zh.GqZm(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjGq(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjM(Zh.GqZm(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(Zh.GqZp(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjGq(qcSsgqzysytdqk.getQzpzsymj2());
+            } else if (qcSsgqzysytdqk.getSjsyjzmjdw().equals("3")) {//当输入的为平方米时
+                qcSsgqzysytdqk.setSjsyjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjM(Zh.PzM(qcSsgqzysytdqk.getSjsyjzmj()));
+                qcSsgqzysytdqk.setSjsyjzmjPf(qcSsgqzysytdqk.getSjsyjzmj());
+                qcSsgqzysytdqk.setQzpzjzmjGq(Zh.PzGq(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjM(Zh.PzM(qcSsgqzysytdqk.getQzpzsymj2()));
+                qcSsgqzysytdqk.setQzpzjzmjPf(qcSsgqzysytdqk.getQzpzsymj2());
+            }
+            qcSsgqzysytdqk.setSfsb(1);
+            qcSsgqzysytdqkService.saveOrUpdate(qcSsgqzysytdqk);
+
+        }
+
+
+
+        return Result.OK("变更成功!");
+    }
+
     /**
      * 通过id删除
      *

UI2/src/mixins/JeecgListMixin.js

@@ -234,6 +234,11 @@ export const JeecgListMixin = {
       this.$refs.modalForm.title = "编辑";
       this.$refs.modalForm.disableSubmit = false;
     },
+    handleEdit1: function (record) {
+      this.$refs.modalForm.edit1(record);
+      this.$refs.modalForm.title = "变更";
+      this.$refs.modalForm.disableSubmit = false;
+    },
     handleAdd: function () {
       this.$refs.modalForm.add();
       this.$refs.modalForm.title = "新增";

UI2/src/views/qcsb/QcSsgqzysytdqkList.vue

@@ -118,6 +118,7 @@
                           <a-button v-has="'conts:bj'" v-if="record.sfsb===0" @click="handleEdit(record)">编辑</a-button>
 
                                <a-button @click="handleDetail(record)" type='primary'>查看</a-button>
+                          <a-button v-if="record.sfsb===3" @click="handleEdit1(record)" type='primary'>变更</a-button>
                           <a-popconfirm title="上报后将不可修改，是否确认上报?" @confirm="() => handleSB(record.id)">
                   <a-button v-has="'conts:sb'" v-if="record.sfsb===0" >上报</a-button>
                 </a-popconfirm>

UI2/src/views/qcsb/QcSsgqzysytdqkList1.vue

@@ -24,7 +24,11 @@
               <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
-
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="文件类型">
+              <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
+            </a-form-item>
+          </a-col>
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="土地使用权人">
@@ -67,6 +71,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
       <!--  <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
       <a-button type="primary" icon="import">导入</a-button>
     </a-upload>

UI2/src/views/qcsb/QcSsgqzysytdqkList2.vue

@@ -24,6 +24,11 @@
               <a-input placeholder="请输入证书/合同/文件编号" v-model="queryParam.wjbh"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="文件类型">
+              <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
+            </a-form-item>
+          </a-col>
 
 
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -62,6 +67,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
      <a-button v-has="'dc'" type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
+      <a-button v-has="'dc'" type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
       <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>

UI2/src/views/qcsb/QcSsgqzysytdqkList_gly.vue

@@ -30,6 +30,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="文件类型">
+              <j-dict-select-tag placeholder="请选择文件类型" v-model="queryParam.wjlx" dictCode="wjlx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="是否上报">
               <j-dict-select-tag placeholder="请选择是否上报" v-model="queryParam.sfsb" dictCode="xxsbzt"/>
             </a-form-item>
@@ -77,6 +82,7 @@
     <div class="table-operator">
       <a-button v-has="'conts:add'" @click="handleAdd2" type="primary" icon="plus">填报信息</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>

UI2/src/views/qcsb/modules/QcSsgqzysytdqkForm.vue

@@ -1010,6 +1010,7 @@ export default {
       url: {
         add: '/qcsb/qcSsgqzysytdqk/add',
         edit: '/qcsb/qcSsgqzysytdqk/edit',
+        edit1: '/qcsb/qcSsgqzysytdqk/edit1',
         queryById: '/qcsb/qcSsgqzysytdqk/queryById'
       },
       disabledDate: '',
@@ -1132,7 +1133,10 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
     },
-
+    edit1(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
     submitForm() {
       const that = this
       // 触发表单验证
@@ -1168,6 +1172,41 @@ export default {
 
       })
     },
+    submitForm1() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          let startTime = moment(this.model.qsqssj);
+          let endTime = moment(this.model.qsdqsj);
+          if (endTime.valueOf() < startTime.valueOf()) {
+            this.$message.error('请检查权属到期时间是否正确！');
+            return
+          }
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit10
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+
+      })
+    },
     /**
      *点击提示
      */

UI2/src/views/qcsb/modules/QcSsgqzysytdqkModal.vue

@@ -20,6 +20,14 @@
         </a-button>
       </div>
     </template>
+    <template>
+      <div style="position: absolute;left: 10%;top:13px;">
+        <a-button v-if="!disableSubmit"  @click="handleOk1" type="primary" style="margin-bottom: 0;margin-right: 8px">保存</a-button>
+        <a-button @click="handleCancel">
+          关闭
+        </a-button>
+      </div>
+    </template>
     <!--邱东宝 增加modal按钮调整到顶部 end-->
     <apply-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" />
     <qc-ssgqzysytdqk-form ref="realForm" @ok="submitCallback" :disabled="disa" :upload="uploads"></qc-ssgqzysytdqk-form>
@@ -57,6 +65,12 @@
           this.$refs.realForm.edit(record);
         })
       },
+      edit1 (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
       close () {
         this.$emit('close');
         this.visible = false;
@@ -66,6 +80,11 @@
         this.$refs.realForm.submitForm();
           this.disa=false
       },
+      handleOk1 () {
+        this.disa=true
+        this.$refs.realForm.submitForm1();
+        this.disa=false
+      },
       submitCallback(){
         this.$emit('ok');
         this.visible = false;

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList1.vue

@@ -25,6 +25,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书类型">
+              <j-dict-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="取得方式">
               <j-dict-select-tag type='list'v-model='queryParam.syqsyfs'  dictCode='qdfs' placeholder='请选择取得方式' />
             </a-form-item>
@@ -70,6 +75,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">全部导出</a-button>
       <!--  <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
       <a-button type="primary" icon="import">导入</a-button>
     </a-upload>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList2.vue

@@ -25,6 +25,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书类型">
+              <j-dict-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="主管单位">
               <j-dict-select-tag placeholder="请选择主管单位" v-model="queryParam.sysOrgCode" dictCode="zgbm"/>
             </a-form-item>
@@ -71,6 +76,7 @@
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">全部导出</a-button>
       <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>

UI2/src/views/sydwqcsb/QcSsgqzysytdqkList_glyy.vue

@@ -30,6 +30,11 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="证书类型">
+              <j-dict-select-tag placeholder="请选择证书类型" v-model="queryParam.zslx" dictCode="zslx"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="取得方式">
               <j-dict-select-tag type='list'v-model='queryParam.syqsyfs'  dictCode='qdfs' placeholder='请选择取得方式' />
             </a-form-item>
@@ -77,6 +82,7 @@
     <div class="table-operator">
       <a-button v-has="'conts:add'"@click="handleAdd2" type="primary" icon="plus">填报信息</a-button>
     <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('省属国企占有使用土地情况调查')">全部导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>