修改联席会议无法输入内容BUG

src/views/ECONOMICSINDEX/index.vue

@@ -235,174 +235,189 @@
       width="65%"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="220px">
-        <!-- <el-tabs type="border-card">
-          <el-tab-pane label="first">基本信息</el-tab-pane>
-          <el-tab-pane label="option">配置管理</el-tab-pane>
-        </el-tabs> -->
+      <el-tabs v-model="tabMsg" type="border-card">
+        <el-tab-pane name="basicMsg" label="基本信息">
+          <el-form ref="forms" :model="form" :rules="rules" label-width="220px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="进出口总值" prop="jckzz">
+                  <el-input v-model="form.jckzz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="加工贸易进出口值" prop="jgmyjckz">
+                  <el-input v-model="form.jgmyjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="物流货物进出口值" prop="wlhwjckz">
+                  <el-input v-model="form.wlhwjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="一般贸易进出口值" prop="ybmyjckz">
+                  <el-input v-model="form.ybmyjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="经营总收入 " prop="jyzsr">
+                  <el-input v-model="form.jyzsr"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="海关税收 " prop="hgss">
+                  <el-input v-model="form.hgss"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="税务部门税收 " prop="swbmss">
+                  <el-input v-model="form.swbmss"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="货物贸易涉外收支总额 " prop="hwmyswszze">
+                  <el-input v-model="form.hwmyswszze"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="期末企业从业人员 " prop="qmqycyry">
+                  <el-input v-model="form.qmqycyry"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活跃企业数 " prop="hyqys">
+                  <el-input v-model="form.hyqys"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单位面积进出口值 " prop="dwmjjckz">
+                  <el-input v-model="form.dwmjjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单位面积经营总收入 " prop="dwmjjyzsr">
+                  <el-input v-model="form.dwmjjyzsr"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单位面积海关税收 " prop="dwmjhgss">
+                  <el-input v-model="form.dwmjhgss"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单位面积税务部门税收 " prop="dwmjswbmss">
+                  <el-input v-model="form.dwmjswbmss"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="单位面积货物贸易涉外收支额 "
+                  prop="dwmjhwmyswsze"
+                >
+                  <el-input v-model="form.dwmjhwmyswsze"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="期末单位面积企业从业人员 "
+                  prop="qmdwmjqycyry"
+                >
+                  <el-input v-model="form.qmdwmjqycyry"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane name="extraMsg" label="额外信息">
+          <el-form ref="form" :model="form" :rules="rules" label-width="220px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="进出口总值增幅 " prop="jckzzzf">
+                  <el-input v-model="form.jckzzzf"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="同期活跃企业数增幅 " prop="tqhyqyszf">
+                  <el-input v-model="form.tqhyqyszf"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="期末批准规划面积验收率  "
+                  prop="qmpzghmjysl"
+                >
+                  <el-input v-model="form.qmpzghmjysl"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="期末封闭围网面积开发率  "
+                  prop="qmfbwwmjkfl"
+                >
+                  <el-input v-model="form.qmfbwwmjkfl"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="实际使用外资金额  " prop="sjsywzje">
+                  <el-input v-model="form.sjsywzje"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="进出区货物总值 " prop="jcqhwzz">
+                  <el-input v-model="form.jcqhwzz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="进出口总值占其所在省 "
+                  prop="jckzzzqszstqjckbz"
+                >
+                  <el-input v-model="form.jckzzzqszstqjckbz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="维修业务进出口值  " prop="wxywjckz">
+                  <el-input v-model="form.wxywjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="研发业务进出口值  " prop="yfywjckz">
+                  <el-input v-model="form.yfywjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="租赁贸易进出口值  " prop="zlmyjckz">
+                  <el-input v-model="form.zlmyjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="跨境电商业务进出口值  " prop="kjdsywjckz">
+                  <el-input v-model="form.kjdsywjckz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="规模以上工业产值  " prop="gmysgycz">
+                  <el-input v-model="form.gmysgycz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="固定资产投资  " prop="gdtzcz">
+                  <el-input v-model="form.gdtzcz"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="占同期所在市进出口值比重  "
+                  prop="ztqszsjckzbz"
+                >
+                  <el-input v-model="form.ztqszsjckzbz"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="进出口总值" prop="jckzz">
-              <el-input v-model="form.jckzz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="加工贸易进出口值" prop="jgmyjckz">
-              <el-input v-model="form.jgmyjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="物流货物进出口值" prop="wlhwjckz">
-              <el-input v-model="form.wlhwjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="一般贸易进出口值" prop="ybmyjckz">
-              <el-input v-model="form.ybmyjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经营总收入 " prop="jyzsr">
-              <el-input v-model="form.jyzsr"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="海关税收 " prop="hgss">
-              <el-input v-model="form.hgss"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="税务部门税收 " prop="swbmss">
-              <el-input v-model="form.swbmss"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="货物贸易涉外收支总额 " prop="hwmyswszze">
-              <el-input v-model="form.hwmyswszze"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="期末企业从业人员 " prop="qmqycyry">
-              <el-input v-model="form.qmqycyry"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="活跃企业数 " prop="hyqys">
-              <el-input v-model="form.hyqys"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位面积进出口值 " prop="dwmjjckz">
-              <el-input v-model="form.dwmjjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位面积经营总收入 " prop="dwmjjyzsr">
-              <el-input v-model="form.dwmjjyzsr"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位面积海关税收 " prop="dwmjhgss">
-              <el-input v-model="form.dwmjhgss"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位面积税务部门税收 " prop="dwmjswbmss">
-              <el-input v-model="form.dwmjswbmss"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="单位面积货物贸易涉外收支额 "
-              prop="dwmjhwmyswsze"
-            >
-              <el-input v-model="form.dwmjhwmyswsze"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="期末单位面积企业从业人员 " prop="qmdwmjqycyry">
-              <el-input v-model="form.qmdwmjqycyry"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="进出口总值增幅 " prop="jckzzzf">
-              <el-input v-model="form.jckzzzf"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="同期活跃企业数增幅 " prop="tqhyqyszf">
-              <el-input v-model="form.tqhyqyszf"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="期末批准规划面积验收率  " prop="qmpzghmjysl">
-              <el-input v-model="form.qmpzghmjysl"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="期末封闭围网面积开发率  " prop="qmfbwwmjkfl">
-              <el-input v-model="form.qmfbwwmjkfl"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="实际使用外资金额  " prop="sjsywzje">
-              <el-input v-model="form.sjsywzje"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="进出区货物总值 " prop="jcqhwzz">
-              <el-input v-model="form.jcqhwzz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="进出口总值占其所在省 "
-              prop="jckzzzqszstqjckbz"
-            >
-              <el-input v-model="form.jckzzzqszstqjckbz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="维修业务进出口值  " prop="wxywjckz">
-              <el-input v-model="form.wxywjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="研发业务进出口值  " prop="yfywjckz">
-              <el-input v-model="form.yfywjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="租赁贸易进出口值  " prop="zlmyjckz">
-              <el-input v-model="form.zlmyjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="跨境电商业务进出口值  " prop="kjdsywjckz">
-              <el-input v-model="form.kjdsywjckz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="规模以上工业产值  " prop="gmysgycz">
-              <el-input v-model="form.gmysgycz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="固定资产投资  " prop="gdtzcz">
-              <el-input v-model="form.gdtzcz"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              label="占同期所在市进出口值比重  "
-              prop="ztqszsjckzbz"
-            >
-              <el-input v-model="form.ztqszsjckzbz"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -424,6 +439,8 @@ export default {
   name: "ECONOMICSINDEX",
   data() {
     return {
+      tabMsg: "basicMsg",
+
       // 根路径
       baseURL: process.env.VUE_APP_BASE_API,
       // 遮罩层
@@ -913,7 +930,18 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      let is;
+      this.$refs["form"].validate((valid)=>{
+        if(!valid) {
+          this.$message.error("额外数据未填写齐全");
+          is = true;
+        }
+        return;
+      })
+      
+      if (is) return false;
+
+      this.$refs["forms"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
             updateECONOMICSINDEX(this.form).then((response) => {

src/views/GARDENBASEDATA/index.vue

@@ -465,9 +465,7 @@
           </el-form>
         </el-tab-pane>
       </el-tabs>
-      <!-- <el-form>
-        <h1>123</h1>
-      </el-form> -->
+
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/GATHER/index.vue

@@ -631,7 +631,7 @@
           :rules="rules"
           :key="listItem.normfeeId"
         >
-          <!-- :rules="rules" ref="form" -->z
+          <!-- :rules="rules" ref="form" -->
           <el-form-item
             :label="
               listItem.normfeeName + '（' + listItem.funitName + '）'

src/views/JOINTCONFERENCE/add.vue

@@ -120,7 +120,9 @@ export default {
 
       deptId: [],
       deptList: [],
-      form: {},
+      form: {
+        conferenceContent:'',
+      },
       rules: {
         conferenceTitle: [
           { required: true, message: "会议标题不能为空", trigger: "blur" },
@@ -150,6 +152,8 @@ export default {
         let arr = eval("(" + this.form.deptIds + ")");
         this.seleValue = arr;
         this.deptId = JSON.parse(this.form.deptIds);
+        // this.form.conferenceContent = response.data.conferenceContent || '123';
+        // console.log(response.data);
       });
     }
 
@@ -169,8 +173,7 @@ export default {
     });
   },
   updated() {
-    // console.log(this.$refs.test.innerText);
-    this.form.conferenceContent = this.$refs["test"].innerText;
+    this.form.conferenceContent = this.$refs["test"].innerText ;
   },
 
   methods: {
@@ -227,11 +230,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      if (this.seleValue.length == 0) {
-        this.$message.error("请选择协作单位");
-        return;
-      }
       this.$refs["form"].validate((valid) => {
+        if (this.seleValue.length == 0) {
+          this.$message.error("请选择协作单位");
+          return;
+        }
         if (valid) {
           if (this.form.id != null) {
             this.form.cooperativeUnitId = this.seleValue;

src/views/JOINTCONFERENCE/detail.vue

@@ -16,6 +16,11 @@
         >
       </el-descriptions-item>
     </el-descriptions>
+    <el-descriptions border :labelStyle="{ width: '120px' }" >
+      <el-descriptions-item label="协作单位">
+        <span v-text="form.conference.cooperativeUnit"></span>
+      </el-descriptions-item>
+    </el-descriptions>
 
     <!-- <div class="detail_item">
       <div class="title">会议标题：</div>
@@ -45,6 +50,7 @@
           v-html="form.conference.conferenceContent"
         ></div>
       </div>
+      
       <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
           :disabled="true"