Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

xiaomiao
Showing 8 changed files with 36 additions and 23 deletions
src/views/components/imagePreview.vue
src/views/workflow/components/clxx/clxx.vue
src/views/workflow/components/clxx/clxxUnify.vue
src/views/workflow/components/dialog/zsyl.vue
src/views/ywbl/slsqxx/tdsyq/slxx.vue
src/views/ywbl/ywsq/components/fwsyq.vue
src/views/ywbl/ywsq/guidePage.vue
src/views/ywbl/ywsq/selectBdc.vue
--- a/src/views/components/imagePreview.vue
View file @3b4b0bc
+++ b/src/views/components/imagePreview.vue
View file @3b4b0bc
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-06-21 16:35:04
+ * @LastEditTime: 2023-07-04 16:07:37
 -->
 <template>
  <div class="rlPopup">
@@ -26,13 +26,13 @@
        <el-upload class="fileUpdate" ref="upload" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
          :on-change="handleChange"
          accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg" :before-upload="beforeUpload">
-          <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype">上传</el-button>
+          <el-button icon="el-icon-upload" type="primary" v-if="!this.$route.query.viewtype && ableOperation">上传</el-button>
        </el-upload>
        <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
-          v-if="!this.$route.query.viewtype && thumbnailImages.length>0">删除</el-button>
+          v-if="!this.$route.query.viewtype && thumbnailImages.length>0 && ableOperation">删除</el-button>
        <div v-if="!this.$route.query.viewtype" class="pl-5">
-          <el-button type="primary" @click="handleOpenScan">{{scanTitle}}</el-button>
+          <el-button type="primary" @click="handleOpenScan" v-if="ableOperation">{{scanTitle}}</el-button>
-          <el-button type="primary" @click="handleViewScan" v-if="isScan">拍照</el-button>
+          <el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
        </div>
      </div>
      <ul>
@@ -58,6 +58,10 @@
      previewImg: {
        type: Object,
        default: () => { }
+      },
+      ableOperation: {
+        type: Boolean,
+        default: true
      }
    },
    components: {
--- a/src/views/workflow/components/clxx/clxx.vue
View file @3b4b0bc
+++ b/src/views/workflow/components/clxx/clxx.vue
View file @3b4b0bc
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-06-21 15:34:44
+ * @LastEditTime: 2023-07-04 16:05:44
 -->
 <template>
  <div class="clxx">
@@ -33,7 +33,7 @@
            </div>
          </div>
        </div>
-        <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
+        <image-preview ref='imageRef' v-if="tableData.length>0" :ableOperation="ableOperation" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
          @prevPriview="prevPriview" />
      </div>
    </div>
@@ -49,6 +49,8 @@
    components: { clxxAddDialog, imagePreview },
    data () {
      return {
+        //表单是否可操作
+        ableOperation: true,
        isDialog: false,
        menuList: [
          {
@@ -214,6 +216,7 @@
      ...mapGetters(["dictData"])
    },
    created () {
+      this.ableOperation = this.$parent.currentSelectTab.ableOperation
      this.clmlInitList()
    },
    methods: {
--- a/src/views/workflow/components/clxx/clxxUnify.vue
View file @3b4b0bc
+++ b/src/views/workflow/components/clxx/clxxUnify.vue
View file @3b4b0bc
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-06-21 16:29:37
+ * @LastEditTime: 2023-07-04 16:08:03
 -->
 <template>
  <div class="clxx">
@@ -22,9 +22,11 @@
              </div>
            </div>
          </div>
-          <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
+          <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()"
+            v-if="!this.$route.query.viewtype && ableOperation">新增</el-button>
        </div>
-        <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
+        <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" :ableOperation="ableOperation" @updateList="updateList"
+          @nextPriview="nextPriview"
          @prevPriview="prevPriview" />
      </div>
    </div>
@@ -42,6 +44,8 @@
    components: { clxxAddDialog, imagePreview, clxxDetailDialog },
    data () {
      return {
+        //表单是否可操作
+        ableOperation: true,
        isDialog: false,
        iclass: "",
        // 材料目录选中
@@ -63,6 +67,7 @@
      ...mapGetters(["dictData"])
    },
    created () {
+      this.ableOperation = this.$parent.currentSelectTab.ableOperation
      this.clmlInitList(1)
    },
    methods: {
--- a/src/views/workflow/components/dialog/zsyl.vue
View file @3b4b0bc
+++ b/src/views/workflow/components/dialog/zsyl.vue
View file @3b4b0bc
 <!--
 * @Description: 
 * @Autor: renchao
- * @LastEditTime: 2023-06-30 14:32:40
+ * @LastEditTime: 2023-07-04 15:04:59
 -->
 <template>
  <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
@@ -20,6 +20,7 @@
 <script>
  import { datas } from "../../javascript/zsyl.js";
  import { getSlsqBdcqzList } from "@/api/bdcqz.js"
+  import { log } from 'bpmn-js-token-simulation';
  export default {
    name: "zsyl",
    props: {
@@ -57,7 +58,6 @@
      }
    },
    mounted () {
-      debugger
      this.columns = datas.columns();
      if (this.formData.bdcqz) {
        //从缮证进入
--- a/src/views/ywbl/slsqxx/tdsyq/slxx.vue
View file @3b4b0bc
+++ b/src/views/ywbl/slsqxx/tdsyq/slxx.vue
View file @3b4b0bc
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-06-29 11:13:35
+ * @LastEditTime: 2023-07-04 16:23:54
 -->
 <template>
  <!-- 受理信息 -->
@@ -88,41 +88,41 @@
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="农用地面积：">
-              <el-input v-model="ruleForm.tdsyq.nydmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.nydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="耕地面积：">
-              <el-input v-model="ruleForm.tdsyq.gdmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.gdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="林地面积：">
-              <el-input v-model="ruleForm.tdsyq.ldmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.ldmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="草地面积：">
-              <el-input v-model="ruleForm.tdsyq.cdmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.cdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="其他农用地面积：">
-              <el-input v-model="ruleForm.tdsyq.qtnydmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.qtnydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="建筑使用面积：">
-              <el-input v-model="ruleForm.tdsyq.jsydmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.jsydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col :span="8">
            <el-form-item label="未利用地面积：">
-              <el-input v-model="ruleForm.tdsyq.wlydmj"></el-input>
+              <el-input v-model="ruleForm.tdsyq.wlydmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="8">
--- a/src/views/ywbl/ywsq/components/fwsyq.vue
View file @3b4b0bc
+++ b/src/views/ywbl/ywsq/components/fwsyq.vue
View file @3b4b0bc
@@ -256,12 +256,12 @@
                type: 'success'
              })
              store.dispatch('user/refreshPage', true);
+              this.$popupCacel()
            } else {
              this.$message.error(res.message);
            }
          })
        }
-        this.$popupCacel()
      },
      handleSelectionChange (val) {
        this.bdcdysz = val
--- a/src/views/ywbl/ywsq/guidePage.vue
View file @3b4b0bc
+++ b/src/views/ywbl/ywsq/guidePage.vue
View file @3b4b0bc
@@ -91,7 +91,7 @@
  </div>
 </template>
 <script>
-  import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz,getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
+  import { getCollectBiz, getleftMenu, getNextNode, getRepairBiz, getTogetherBiz, addCollectBiz, deleteCollectBiz } from "@/api/ywbl"
  export default {
    data () {
      return {
--- a/src/views/ywbl/ywsq/selectBdc.vue
View file @3b4b0bc
+++ b/src/views/ywbl/ywsq/selectBdc.vue
View file @3b4b0bc
@@ -24,7 +24,7 @@
    },
    mounted () {
      if (this.formData?.sqywInfo?.djywbm || this.formData?.djywbm) {
-        let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm,this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
+        let view = queueDjywmc(this.formData?.sqywInfo?.djywbm || this.formData?.djywbm, this.formData?.sqywInfo?.nodecode || this.formData?.nodecode);
        this.router = this.loadView(view);
      } else {
        let view = queueDjywmc(this.$route.query?.sqywbm);
@@ -33,6 +33,7 @@
    },
    methods: {
      loadView (view) {
+        console.log(view, 'view');
        return (r) =>
          require.ensure([], () => r(require(`./components/${view}.vue`)));
      },