流程控制，表单布局

src/api/wf/PROTEMPLATE.js

@@ -101,7 +101,7 @@ export function updatePro(data) {
 // 获取用户列表
 export function getUser() {
   return request({
-    url: '/test/user/list',
+    url: '/system/user/listAll',
     method: 'get',
   })
 }

src/views/BONDEDUPPLY/index.vue

@@ -1,12 +1,27 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="录单单位名称">
         <el-input v-model="queryParams.lddwmc"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -140,7 +155,13 @@
     />
 
     <!-- 添加或修改保税区供应链数据对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="65%" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="65%"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="12">
@@ -212,10 +233,19 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
-              <el-input v-model="form.jwsfhrdz"></el-input>
+            <el-form-item label="卸毕日期   " prop="xbrq">
+              <!--              <el-input v-model="form.xbrq"></el-input>-->
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.xbrq"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
             <el-form-item label="启运日期  " prop="qyrq">
               <!-- <el-input v-model="form.qyrq"></el-input> -->
@@ -232,16 +262,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="卸毕日期   " prop="xbrq">
-<!--              <el-input v-model="form.xbrq"></el-input>-->
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.xbrq"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
+            <el-form-item label="境外收发货人地址   " prop="jwsfhrdz">
+              <el-input v-model="form.jwsfhrdz"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -267,15 +289,12 @@
           <el-col :span="12"></el-col>
         </el-row>
 
-
-
         <!-- <el-form-item label="供应链主键  " prop="id">
           <el-input v-model="form.id"></el-input>
         </el-form-item>
         <el-form-item label="保税区主键  " prop="deptId">
           <el-input v-model="form.deptId"></el-input>
         </el-form-item> -->
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -533,7 +552,7 @@ export default {
               this.reset();
             });
           }
-        }else{
+        } else {
           this.$message.error("请补全境内外信息");
         }
       });

src/views/ECONOMICSINDEX/index.vue

@@ -228,99 +228,175 @@
     />
 
     <!-- 添加或修改综合保税区经济运行主要指标对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="65%" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="65%"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="220px">
-        <el-form-item label="进出口总值" prop="jckzz">
-          <el-input v-model="form.jckzz"></el-input>
-        </el-form-item>
-        <el-form-item label="加工贸易进出口值" prop="jgmyjckz">
-          <el-input v-model="form.jgmyjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="物流货物进出口值" prop="wlhwjckz">
-          <el-input v-model="form.wlhwjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="一般贸易进出口值" prop="ybmyjckz">
-          <el-input v-model="form.ybmyjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="经营总收入 " prop="jyzsr">
-          <el-input v-model="form.jyzsr"></el-input>
-        </el-form-item>
-        <el-form-item label="海关税收 " prop="hgss">
-          <el-input v-model="form.hgss"></el-input>
-        </el-form-item>
-        <el-form-item label="税务部门税收 " prop="swbmss">
-          <el-input v-model="form.swbmss"></el-input>
-        </el-form-item>
-        <el-form-item label="货物贸易涉外收支总额 " prop="hwmyswszze">
-          <el-input v-model="form.hwmyswszze"></el-input>
-        </el-form-item>
-        <el-form-item label="期末企业从业人员 " prop="qmqycyry">
-          <el-input v-model="form.qmqycyry"></el-input>
-        </el-form-item>
-        <el-form-item label="活跃企业数 " prop="hyqys">
-          <el-input v-model="form.hyqys"></el-input>
-        </el-form-item>
-        <el-form-item label="单位面积进出口值 " prop="dwmjjckz">
-          <el-input v-model="form.dwmjjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="单位面积经营总收入 " prop="dwmjjyzsr">
-          <el-input v-model="form.dwmjjyzsr"></el-input>
-        </el-form-item>
-        <el-form-item label="单位面积海关税收 " prop="dwmjhgss">
-          <el-input v-model="form.dwmjhgss"></el-input>
-        </el-form-item>
-        <el-form-item label="单位面积税务部门税收 " prop="dwmjswbmss">
-          <el-input v-model="form.dwmjswbmss"></el-input>
-        </el-form-item>
-        <el-form-item label="单位面积货物贸易涉外收支额 " prop="dwmjhwmyswsze">
-          <el-input v-model="form.dwmjhwmyswsze"></el-input>
-        </el-form-item>
-        <el-form-item label="期末单位面积企业从业人员 " prop="qmdwmjqycyry">
-          <el-input v-model="form.qmdwmjqycyry"></el-input>
-        </el-form-item>
-        <el-form-item label="进出口总值增幅 " prop="jckzzzf">
-          <el-input v-model="form.jckzzzf"></el-input>
-        </el-form-item>
-        <el-form-item label="同期活跃企业数增幅 " prop="tqhyqyszf">
-          <el-input v-model="form.tqhyqyszf"></el-input>
-        </el-form-item>
-
-        <el-form-item label="期末批准规划面积验收率  " prop="qmpzghmjysl">
-          <el-input v-model="form.qmpzghmjysl"></el-input>
-        </el-form-item>
-        <el-form-item label="期末封闭围网面积开发率  " prop="qmfbwwmjkfl">
-          <el-input v-model="form.qmfbwwmjkfl"></el-input>
-        </el-form-item>
-        <el-form-item label="实际使用外资金额  " prop="sjsywzje">
-          <el-input v-model="form.sjsywzje"></el-input>
-        </el-form-item>
-        <el-form-item label="进出区货物总值 " prop="jcqhwzz">
-          <el-input v-model="form.jcqhwzz"></el-input>
-        </el-form-item>
-        <el-form-item label="进出口总值占其所在省 " prop="jckzzzqszstqjckbz">
-          <el-input v-model="form.jckzzzqszstqjckbz"></el-input>
-        </el-form-item>
-        <el-form-item label="维修业务进出口值  " prop="wxywjckz">
-          <el-input v-model="form.wxywjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="研发业务进出口值  " prop="yfywjckz">
-          <el-input v-model="form.yfywjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="租赁贸易进出口值  " prop="zlmyjckz">
-          <el-input v-model="form.zlmyjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="跨境电商业务进出口值  " prop="kjdsywjckz">
-          <el-input v-model="form.kjdsywjckz"></el-input>
-        </el-form-item>
-        <el-form-item label="规模以上工业产值  " prop="gmysgycz">
-          <el-input v-model="form.gmysgycz"></el-input>
-        </el-form-item>
-        <el-form-item label="固定资产投资  " prop="gdtzcz">
-          <el-input v-model="form.gdtzcz"></el-input>
-        </el-form-item>
-        <el-form-item label="占同期所在市进出口值比重  " prop="ztqszsjckzbz">
-          <el-input v-model="form.ztqszsjckzbz"></el-input>
-        </el-form-item>
+        <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>

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -161,148 +161,189 @@
       :title="title"
       :visible.sync="open"
       :close-on-click-modal="false"
-      width="40%"
+      width="50%"
       append-to-body
     >
       <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="first">
           <el-form ref="forms" :model="form" :rules="rules" label-width="180px">
-            <el-form-item label="部门" prop="deptName">
-              <el-select
-                v-model="form.deptName"
-                @change="deptSelect"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="(item, index) in deptList"
-                  :key="index"
-                  :label="item.deptName"
-                  :value="index"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="固定资产投资" prop="gdzctz">
-              <el-input
-                v-model="form.gdzctz"
-                placeholder="请输入固定资产投资"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="资产分类 " prop="zcfl">
-              <el-input
-                v-model="form.zcfl"
-                placeholder="请输入资产分类 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="主要贸易国家 " prop="zymygj">
-              <el-input
-                v-model="form.zymygj"
-                placeholder="请输入主要贸易国家 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="电子账册分类 " prop="dzzcfl">
-              <el-input
-                v-model="form.dzzcfl"
-                placeholder="请输入电子账册分类 "
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="海关税收" prop="hgss">
-              <el-input
-                v-model="form.hgss"
-                placeholder="请输入海关税收"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="税务部门税收" prop="swbmss">
-              <el-input
-                v-model="form.swbmss"
-                placeholder="请输入税务部门税收"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="期末企业从业人员" prop="qmqycyry">
-              <el-input
-                v-model="form.qmqycyry"
-                placeholder="请输入期末企业从业人员"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="实际使用外资金额" prop="sjsywzje">
-              <el-input
-                v-model="form.sjsywzje"
-                placeholder="请输入实际使用外资金额"
-              ></el-input>
-            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="部门" prop="deptName">
+                  <el-select
+                    v-model="form.deptName"
+                    @change="deptSelect"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="(item, index) in deptList"
+                      :key="index"
+                      :label="item.deptName"
+                      :value="index"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="固定资产投资" prop="gdzctz">
+                  <el-input
+                    v-model="form.gdzctz"
+                    placeholder="请输入固定资产投资"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="资产分类 " prop="zcfl">
+                  <el-input
+                    v-model="form.zcfl"
+                    placeholder="请输入资产分类 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="主要贸易国家 " prop="zymygj">
+                  <el-input
+                    v-model="form.zymygj"
+                    placeholder="请输入主要贸易国家 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="电子账册分类 " prop="dzzcfl">
+                  <el-input
+                    v-model="form.dzzcfl"
+                    placeholder="请输入电子账册分类 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="海关税收" prop="hgss">
+                  <el-input
+                    v-model="form.hgss"
+                    placeholder="请输入海关税收"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="税务部门税收" prop="swbmss">
+                  <el-input
+                    v-model="form.swbmss"
+                    placeholder="请输入税务部门税收"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="期末企业从业人员" prop="qmqycyry">
+                  <el-input
+                    v-model="form.qmqycyry"
+                    placeholder="请输入期末企业从业人员"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="实际使用外资金额" prop="sjsywzje">
+                  <el-input
+                    v-model="form.sjsywzje"
+                    placeholder="请输入实际使用外资金额"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="进出口信息" name="second">
           <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-            <el-form-item label="规模以上工业产值" prop="gmysgycz">
-              <el-input
-                v-model="form.gmysgycz"
-                placeholder="请输入规模以上工业产值"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item label="进出口总值" prop="jckzz">
-              <el-input
-                v-model="form.jckzz"
-                placeholder="请输入进出口总值"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="进口总值" prop="jkzz">
-              <el-input
-                v-model="form.jkzz"
-                placeholder="请输入进口总值"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="出口总值" prop="ckzz">
-              <el-input
-                v-model="form.ckzz"
-                placeholder="请输入出口总值"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="加工贸易进出口值 " prop="jgmyjckz">
-              <el-input
-                v-model="form.jgmyjckz"
-                placeholder="请输入加工贸易进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="物流货物进出口值 " prop="wlhwjckz">
-              <el-input
-                v-model="form.wlhwjckz"
-                placeholder="请输入物流货物进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="一般贸易进出口值 " prop="ybmyjckz">
-              <el-input
-                v-model="form.ybmyjckz"
-                placeholder="请输入一般贸易进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="维修业务进出口值 " prop="wxyejckz">
-              <el-input
-                v-model="form.wxyejckz"
-                placeholder="请输入维修业务进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="研发业务进出口值 " prop="yfywjckz">
-              <el-input
-                v-model="form.yfywjckz"
-                placeholder="请输入研发业务进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="租赁贸易进出口值 " prop="zlmyjckz">
-              <el-input
-                v-model="form.zlmyjckz"
-                placeholder="请输入租赁贸易进出口值 "
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="跨境电商业务进出口值 " prop="kjdsywjckz">
-              <el-input
-                v-model="form.kjdsywjckz"
-                placeholder="请输入跨境电商业务进出口值 "
-              ></el-input>
-            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="规模以上工业产值" prop="gmysgycz">
+                  <el-input
+                    v-model="form.gmysgycz"
+                    placeholder="请输入规模以上工业产值"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="进出口总值" prop="jckzz">
+                  <el-input
+                    v-model="form.jckzz"
+                    placeholder="请输入进出口总值"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="进口总值" prop="jkzz">
+                  <el-input
+                    v-model="form.jkzz"
+                    placeholder="请输入进口总值"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="出口总值" prop="ckzz">
+                  <el-input
+                    v-model="form.ckzz"
+                    placeholder="请输入出口总值"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="加工贸易进出口值 " prop="jgmyjckz">
+                  <el-input
+                    v-model="form.jgmyjckz"
+                    placeholder="请输入加工贸易进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="物流货物进出口值 " prop="wlhwjckz">
+                  <el-input
+                    v-model="form.wlhwjckz"
+                    placeholder="请输入物流货物进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="一般贸易进出口值 " prop="ybmyjckz">
+                  <el-input
+                    v-model="form.ybmyjckz"
+                    placeholder="请输入一般贸易进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="维修业务进出口值 " prop="wxyejckz">
+                  <el-input
+                    v-model="form.wxyejckz"
+                    placeholder="请输入维修业务进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="研发业务进出口值 " prop="yfywjckz">
+                  <el-input
+                    v-model="form.yfywjckz"
+                    placeholder="请输入研发业务进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="租赁贸易进出口值 " prop="zlmyjckz">
+                  <el-input
+                    v-model="form.zlmyjckz"
+                    placeholder="请输入租赁贸易进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="跨境电商业务进出口值 " prop="kjdsywjckz">
+                  <el-input
+                    v-model="form.kjdsywjckz"
+                    placeholder="请输入跨境电商业务进出口值 "
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-tab-pane>
       </el-tabs>
@@ -571,6 +612,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.activeName = 'first';
       this.reset();
       const id = row.id || this.ids;
       getENTERPRISETRADEPERFORMANCE(id).then((response) => {
@@ -595,7 +637,7 @@ export default {
         }
       });
       if (is) return;
-      
+
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -611,7 +653,7 @@ export default {
               this.getList();
             });
           }
-        }else{
+        } else {
           this.$message.error("请补全进出口信息");
         }
       });

src/views/GARDENDATA/index.vue

@@ -131,7 +131,7 @@
         <el-form-item prop="value" label="数值">
           <el-input  v-model="form.value" placeholder="请输入数值" ></el-input>
         </el-form-item>
-        <el-form-item prop="year"label="年份">
+        <el-form-item prop="year" label="年份">
           <el-input  v-model="form.year" placeholder="请输入年份" ></el-input>
         </el-form-item>
       </el-form>
@@ -234,7 +234,6 @@ export default {
         this.deptList = data.filter(item => {
           return item.type === 2 || item.type === 3;
         })
-        console.log(this.deptList)
         this.loading = false;
       });
     },

src/views/IMPORTANTPROJECT/index.vue

@@ -81,7 +81,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="重点项目数据	主键" align="center" prop="id"> -->
-        <!-- <template slot-scope="scope">
+      <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.id"/>
         </template> -->
       <!-- </el-table-column> -->
@@ -150,7 +150,7 @@
         </template> -->
       </el-table-column>
       <!-- <el-table-column label="部门主键" align="center" prop="deptId"> -->
-        <!-- <template slot-scope="scope">
+      <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.deptId"/>
         </template> -->
       <!-- </el-table-column> -->
@@ -191,81 +191,105 @@
     />
 
     <!-- 添加或修改重点项目数据							 对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="35%" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="50%"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"></el-input>
-        </el-form-item>
-
-        <el-form-item label="建设单位" prop="jsdw">
-          <el-select
-            v-model="buildValue"
-            @change="selectBuild"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="(item, index) in deptList"
-              :key="index"
-              :label="item.deptName"
-              :value="item.deptId"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="承设单位" prop="cjdw">
-          <!-- {{ buildValue  }} -->
-          <el-select
-            v-model="deptValue"
-            @change="selectDept"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="(item, index) in deptList"
-              :key="index"
-              :label="item.deptName"
-              :value="item.deptId"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="建设规模 " prop="jsgm">
-          <el-input
-            v-model="form.jsgm"
-            placeholder="请输入建设规模 "
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="建设内容 " prop="jsnr">
-          <el-input
-            v-model="form.jsnr"
-            placeholder="请输入建设内容 "
-          ></el-input>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="xmmc">
+              <el-input
+                v-model="form.xmmc"
+                placeholder="请输入项目名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建设规模 " prop="jsgm">
+              <el-input
+                v-model="form.jsgm"
+                placeholder="请输入建设规模 "
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-form-item label="年度投资计划 " prop="ndtzjh">
-          <el-input
-            type="number"
-            v-model="form.ndtzjh"
-            placeholder="请输入年度投资计划 "
-          ></el-input>
-        </el-form-item>
+         
 
-        <el-form-item label="实际完成投资额 " prop="sjwctze">
-          <el-input
-            type="number"
-            v-model="form.sjwctze"
-            placeholder="请输入实际完成投资额 "
-          ></el-input>
-        </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="建设内容 " prop="jsnr">
+              <el-input
+                v-model="form.jsnr"
+                placeholder="请输入建设内容 "
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年度投资计划 " prop="ndtzjh">
+              <el-input
+                type="number"
+                v-model="form.ndtzjh"
+                placeholder="请输入年度投资计划 "
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="实际完成投资额 " prop="sjwctze">
+              <el-input
+                type="number"
+                v-model="form.sjwctze"
+                placeholder="请输入实际完成投资额 "
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="年度投资完成百分比 " prop="ndtzwcbfb">
+              <el-input
+                type="number"
+                v-model="form.ndtzwcbfb"
+                placeholder="请输入年度投资完成百分比 "
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-form-item label="年度投资完成百分比 " prop="ndtzwcbfb">
-          <el-input
-            type="number"
-            v-model="form.ndtzwcbfb"
-            placeholder="请输入年度投资完成百分比 "
-          ></el-input>
-        </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="建设单位" prop="jsdw">
+              <el-select
+                v-model="form.jsdw"
+                @change="selectBuild"
+                placeholder="请选择建设单位"
+              >
+                <el-option
+                  v-for="(item, index) in deptList"
+                  :key="index"
+                  :label="item.deptName"
+                  :value="item.deptId+''"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="承建单位" prop="deptId">
+              <el-select
+                v-model="form.deptId"
+                @change="selectDept"
+                placeholder="请选择承设单位"
+              >
+                <el-option
+                  v-for="(item, index) in deptList"
+                  :key="index"
+                  :label="item.deptName"
+                  :value="item.deptId+''"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -395,7 +419,6 @@ export default {
           this.deptList.push(item);
         }
       });
-      console.log(this.deptList);
     });
   },
   methods: {

src/views/wf/index.vue

@@ -8,23 +8,27 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-col :span="8">
-        <el-form-item label="流程名称" prop="proname">
-          <el-input v-model="queryParams.proname" />
-        </el-form-item>
-      </el-col>
-      <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
+      <el-row :gutter="10" style="margin-bottom: 8px">
+        <el-col :span="6">
+          <el-form-item label="流程名称" prop="proname">
+            <el-input v-model="queryParams.proname" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" style="margin-bottom: 8px">
@@ -136,64 +140,92 @@
     />
 
     <!-- 添加或修改流程模板对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="60%" append-to-body>
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      :close-on-click-modal="false"
+      width="60%"
+      append-to-body
+    >
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-        <el-form-item label="所属保税区" prop="cbId">
-          <el-select filterable v-model="form.cbId" placeholder="请选择保税区">
-            <el-option
-              v-for="(item) in cbList"
-              :key="item.deptId"
-              :label="item.deptName"
-              :value="item.deptId"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="流程编码" prop="procode">
-          <el-input
-            v-model="form.procode"
-            placeholder="请输入流程编码"
-            type="text"
-          />
-        </el-form-item>
-        <el-form-item label="流程名称" prop="proname">
-          <el-input
-            v-model="form.proname"
-            placeholder="请输入流程名称"
-            type="text"
-          />
-        </el-form-item>
-        <el-form-item label="关键字" prop="keyword">
-          <el-input
-            v-model="form.keyword"
-            placeholder="请输入关键字"
-            type="text"
-          />
-        </el-form-item>
-        <el-form-item label="排序" prop="seqno">
-          <el-input v-model="form.seqno" placeholder="排序" type="number" />
-        </el-form-item>
-        <el-form-item label="流程说明" prop="pronotes">
-          <el-input
-            v-model="form.pronotes"
-            placeholder="请输入流程说明"
-            type="text"
-          />
-        </el-form-item>
-        <el-form-item label="服务层地址" prop="serviceUrl">
-          <el-input
-            v-model="form.serviceUrl"
-            placeholder="请输入服务层地址"
-            type="text"
-          />
-        </el-form-item>
-        <el-form-item label="前端页面地址" prop="infoUrl">
-          <el-input
-            v-model="form.infoUrl"
-            placeholder="请输入前端页面地址"
-            type="text"
-          />
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属保税区" prop="cbId">
+              <el-select
+                filterable
+                v-model="form.cbId"
+                placeholder="请选择保税区"
+              >
+                <el-option
+                  v-for="item in cbList"
+                  :key="item.deptId"
+                  :label="item.deptName"
+                  :value="item.deptId"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="流程编码" prop="procode">
+              <el-input
+                v-model="form.procode"
+                placeholder="请输入流程编码"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="流程名称" prop="proname">
+              <el-input
+                v-model="form.proname"
+                placeholder="请输入流程名称"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="关键字" prop="keyword">
+              <el-input
+                v-model="form.keyword"
+                placeholder="请输入关键字"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="seqno">
+              <el-input v-model="form.seqno" placeholder="排序" type="number" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="流程说明" prop="pronotes">
+              <el-input
+                v-model="form.pronotes"
+                placeholder="请输入流程说明"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务层地址" prop="serviceUrl">
+              <el-input
+                v-model="form.serviceUrl"
+                placeholder="请输入服务层地址"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="前端页面地址" prop="infoUrl">
+              <el-input
+                v-model="form.infoUrl"
+                placeholder="请输入前端页面地址"
+                type="text"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -286,7 +318,7 @@
       :title="Protitle"
       :visible.sync="openProAddOrEdit"
       :close-on-click-modal="false"
-      width="60%"
+      width="40%"
       append-to-body
     >
       <el-form ref="form2" :model="Proform" label-width="140px">
@@ -332,11 +364,7 @@
           <el-radio v-model="Proform.remessage" label="2">不提醒</el-radio>
         </el-form-item>
         <el-form-item label="活动顺序" prop="seqno">
-          <el-input
-            v-model="Proform.seqno"
-            placeholder="请输入活动顺序"
-            type="text"
-          />
+          <el-input-number v-model="Proform.seqno"  :min="1" :max="10" label=""></el-input-number>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -360,10 +388,10 @@ import {
   addPro,
   updatePro,
   getUser,
-  enableOrDisable
+  enableOrDisable,
 } from "@/api/wf/PROTEMPLATE";
 
-import {listDeptByCb} from "@/api/system/dept";
+import { listDeptByCb } from "@/api/system/dept";
 
 export default {
   name: "PROTEMPLATE",
@@ -419,7 +447,7 @@ export default {
       // 表单参数
       form: {},
       Proform: {},
-      cbList:[], //保税区数据
+      cbList: [], //保税区数据
       // 表单校验
       rules: {
         cbId: [
@@ -457,13 +485,13 @@ export default {
     this.getCbList();
   },
   methods: {
-    getCbList(){
+    getCbList() {
       listDeptByCb("").then((res) => {
         this.cbList = res.data;
       });
     },
-    handleStatus(row){
-      enableOrDisable(row)
+    handleStatus(row) {
+      enableOrDisable(row);
       this.getList();
     },
     searchUserName(id) {
@@ -518,7 +546,7 @@ export default {
         for (const i in res.data) {
           this.user.push({
             value: res.data[i].userId,
-            label: res.data[i].username,
+            label: res.data[i].nickName,
           });
         }
       });