Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/views/AttendMeeting/index.vue

@@ -125,21 +125,21 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:query']"
+            v-if="checkPermi(['business:JOINTCONFERENCE:query'])"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:add']"
+            v-if="checkPermi(['business:JOINTCONFERENCE:assign'])"
             >单位指派</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleReply(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-if="checkPermi(['business:JOINTCONFERENCE:edit'])"
             >会议回复</el-button
           >
         </template>
@@ -169,6 +169,7 @@ import detail from "@/views/JOINTCONFERENCE/detail.vue";
 import callback from "@/views/JOINTCONFERENCE/callback.vue";
 
 import { getInfo } from "@/api/login";
+import { checkPermi } from "@/utils/permission.js";
 
 export default {
   // name: "JOINTCONFERENCE",
@@ -358,7 +359,7 @@ export default {
 
       this.iframe({
         obj: add,
-        param: {id:id},
+        param: { id: id },
         title: "修改会议",
         width: "750px",
         height: "60%",

src/views/BONDED/index.vue

@@ -7,74 +7,65 @@
       </el-form-item>
     </el-form> -->
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['business:BONDED:add']"
-          >注册</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business:BONDED:edit']"
-          >修改</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:BONDED:remove']"
-          >删除</el-button
-        >
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
+<!--    上方按钮暂时不用-->
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['business:BONDED:add']"-->
+<!--          >注册</el-button-->
+<!--        >-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['business:BONDED:edit']"-->
+<!--          >修改</el-button-->
+<!--        >-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['business:BONDED:remove']"-->
+<!--          >删除</el-button-->
+<!--        >-->
+<!--      </el-col>-->
+<!--      <right-toolbar-->
+<!--        :showSearch.sync="showSearch"-->
+<!--        @queryTable="getList"-->
+<!--      ></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table
-      
       :data="BONDEDList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保税区名称" align="center" prop="bondedName">
-        <template slot-scope="scope">
-          {{ scope.row.bondedName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="场站编号" align="center" prop="yardNumber">
-        <template slot-scope="scope">
-          {{ scope.row.yardNumber }}
-        </template>
-      </el-table-column>
-      <el-table-column label="成立时间" align="center" prop="establishedTime">
-        <template slot-scope="scope">
-          {{ scope.row.establishedTime }}
-        </template>
-      </el-table-column>
-      <el-table-column label="地址" align="center" prop="site">
-        <template slot-scope="scope">
-          {{ scope.row.site }}
-        </template>
-      </el-table-column>
+<!--      <el-table-column type="selection" width="55" align="center" ></el-table-column>-->
+      <el-table-column label="保税区名称" align="center" prop="deptName"></el-table-column>
+      <el-table-column label="产品定位" align="center" prop="industryOrientation"></el-table-column>
+      <el-table-column label="规划面积" align="center" prop="planningArea"></el-table-column>
+      <el-table-column label="验收面积" align="center" prop="acceptanceArea"></el-table-column>
+      <el-table-column label="已使用面积" align="center" prop="useArea"></el-table-column>
+      <el-table-column label="使用率" align="center" prop="usageRate"></el-table-column>
+      <el-table-column label="仓库面积" align="center" prop="warehouse"></el-table-column>
+      <el-table-column label="油库面积" align="center" prop="oilDepot"></el-table-column>
+      <el-table-column label="冷库面积" align="center" prop="refrigeratory"></el-table-column>
+      <el-table-column label="厂房面积" align="center" prop="workshop"></el-table-column>
+      <el-table-column label="批复面积" align="center" prop="approvalTime"></el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -85,18 +76,18 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row.deptId)"
             v-hasPermi="['business:BONDED:edit']"
             >修改</el-button
           >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:BONDED:remove']"
-            >删除</el-button
-          >
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row.deptId)"-->
+<!--            v-hasPermi="['business:BONDED:remove']"-->
+<!--            >删除</el-button-->
+<!--          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -110,33 +101,79 @@
     />
 
     <!-- 添加或修改保税区管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" 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="100px">
-        <el-form-item label="保税区名称" prop="bondedName">
-          <el-input
-            v-model="form.bondedName"
-            placeholder="请输入保税区名称"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="场站编号" prop="yardNumber">
-          <el-input
-            v-model="form.yardNumber"
-            placeholder="请输入场站编号"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="成立时间" prop="establishedTime">
-          <el-date-picker
-            v-model="form.establishedTime"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy 年 MM 月 dd 日"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="地址" prop="site">
-          <el-input v-model="form.site" placeholder="请输入地址"></el-input>
-        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="保税区名称" prop="deptName">
+              <el-input v-model="form.deptName" placeholder="请输入保税区名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品定位" prop="industryOrientation">
+              <el-input v-model="form.industryOrientation" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="规划面积" prop="planningArea">
+              <el-input type="number" v-model="form.planningArea" placeholder="请输入（平方公里）"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="验收面积" prop="acceptanceArea">
+              <el-input type="number" v-model="form.acceptanceArea" placeholder="请输入（平方公里）"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="已使用面积" prop="useArea">
+              <el-input type="number" v-model="form.useArea" placeholder="请输入（万平方米）"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库面积" prop="warehouse">
+              <el-input type="number" v-model="form.warehouse" placeholder="请输入（平方米）"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="油库面积" prop="oilDepot">
+              <el-input type="number" v-model="form.oilDepot" placeholder="请输入（平方米）"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="冷库面积" prop="refrigeratory">
+              <el-input type="number" v-model="form.refrigeratory" placeholder="请输入（万平方米）"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="厂房面积" prop="workshop">
+              <el-input type="number" v-model="form.workshop" placeholder="请输入（万平方米）"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="批复时间" prop="approvalTime">
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.approvalTime"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12"></el-col>
+          <el-col :span="12"></el-col>
+        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -199,24 +236,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [{ required: true, message: "主键id不能为空", trigger: "blur" }],
-        delFlag: [
-          { required: true, message: "删除标记不能为空", trigger: "blur" },
-        ],
-        deptId: [
-          { required: true, message: "部门id不能为空", trigger: "blur" },
-        ],
-        bondedName: [
-          { required: true, message: "保税区名称不能为空", trigger: "blur" },
-        ],
-        yardNumber: [
-          { required: true, message: "场站编号不能为空", trigger: "blur" },
-          { pattern: /^[1-9a-zA-Z]{1,}$/, message: '场站编号只能输入数字和字母', trigger: 'blur' }
-        ],
-        establishedTime: [
-          { required: true, message: "成立时间不能为空", trigger: "blur" },
-        ],
-        site: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+        deptName: [{ required: true, message: "保税区名称不能为空", trigger: "blur" },],
+        industryOrientation: [{ required: true, message: "产业定位不能为空", trigger: "blur" }],
+        planningArea: [{ required: true, message: "规划面积不能为空", trigger: "blur" }],
+        acceptanceArea: [{ required: true, message: "验收面积不能为空", trigger: "blur" }],
+        useArea: [{ required: true, message: "已使用面积不能为空", trigger: "blur" }],
+        usageRate: [{ required: true, message: "使用率不能为空", trigger: "blur" }],
+        warehouse: [{ required: true, message: "仓库面积不能为空", trigger: "blur" }],
+        oilDepot: [{ required: true, message: "油库面积不能为空", trigger: "blur" }],
+        refrigeratory: [{ required: true, message: "冷库面积不能为空", trigger: "blur" }],
+        workshop: [{ required: true, message: "厂房面积不能为空", trigger: "blur" }],
+        approvalTime: [{ required: true, message: "批复时间不能为空", trigger: "blur" }],
       },
     };
   },
@@ -228,7 +258,7 @@ export default {
     getList() {
       this.loading = true;
       listBONDED(this.queryParams).then((response) => {
-        this.BONDEDList = response.rows;
+        this.BONDEDList = response;
         this.total = response.total;
         this.loading = false;
       });
@@ -276,18 +306,24 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids;
-      getBONDED(id).then((response) => {
+      // const id = row.id || this.ids;
+      getBONDED(row).then((response) => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改保税区管理";
+        this.title = "修改保税区信息管理";
       });
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.acceptanceArea = parseFloat(this.form.acceptanceArea);
+      this.form.useArea = parseFloat(this.form.useArea);
+      this.form.warehouse = parseFloat(this.form.warehouse);
+      this.form.oilDepot = parseFloat(this.form.oilDepot);
+      this.form.refrigeratory = parseFloat(this.form.refrigeratory);
+      this.form.workshop = parseFloat(this.form.workshop);
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.form.deptId != null) {
             updateBONDED(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -295,7 +331,7 @@ export default {
             });
           } else {
             addBONDED(this.form).then((response) => {
-              this.$modal.msgSuccess("注册成功");
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -305,11 +341,11 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      // const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除？")
         .then(function () {
-          return delBONDED(ids);
+          return delBONDED(row);
         })
         .then(() => {
           this.getList();

src/views/ECONOMICSINDEX/index.vue

@@ -480,35 +480,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        names: [
-          {
-            required: true,
-            message: "综合保税区经济运行主要指标表主键不能为空",
-            trigger: "blur",
-          },
-
-          {
-            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
-            message: "值需为数字或小数",
-            trigger: "blur",
-          },
-        ],
-        id: [
-          {
-            required: true,
-            message: "综合保税区经济运行主要指标表主键不能为空",
-            trigger: "blur",
-          },
-          {
-            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
-            message: "值需为数字或小数",
-            trigger: "blur",
-          },
-        ],
+        
         jckzz: [
           { required: true, message: "进出口总值 不能为空", trigger: "blur" },
           {
-            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            pattern: /^-?(([0-9]*(\.[0-9]{1,100})$)|([0-9]+$))/,
             message: "值需为数字或小数",
             trigger: "blur",
           },
@@ -520,7 +496,7 @@ export default {
             trigger: "blur",
           },
           {
-            pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
+            pattern: /^-?(([0-9]*(\.[0-9]{1,100})$)|([0-9]+$))/,
             message: "值需为数字或小数",
             trigger: "blur",
           },

src/views/JOINTCONFERENCE/callback.vue

@@ -176,6 +176,7 @@ export default {
 .cmain .detail_item {
   display: flex;
   align-items: flex-start;
+  justify-content: start;
   margin-bottom: 20px;
   color: #333333;
   font-size: 16px;