From 4904a627daa8c2cc50e5629ebc2428cdd8fb76ad Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Thu, 9 Jun 2022 16:54:26 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../src/components/CollectionType/index.vue   | 356 +++++++++---------
 .../components/uploadFileChangeDown/file.vue  |   9 +-
 4 files changed, 185 insertions(+), 182 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7720a2d63..e1f8e11ff 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -712,6 +712,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  Frozenstatus: 'Frozen status, can only be viewed',
   chinese: 'chinese',
   integerOrDecimal: 'integer Or Decimal',
   OneDecimalPlace: 'One Decimal Place',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 14fbf2d2a..4633d006b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -723,6 +723,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  Frozenstatus: '冻结状态,仅可以查看',
   chinese: '中文',
   integerOrDecimal: '整数或小数',
   OneDecimalPlace: '一位小数',
diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index b09722ca4..b07eb64da 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -3,8 +3,8 @@
     <div class='box'>
 <!--      纯文本-->
       <div v-if='detailDate.controlType === "1"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -95,9 +95,9 @@
         </div>
       </div>
 <!--      纯下拉单选-->
-      <div v-if='detailDate.controlType === "2"'>
-        <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type === "pull"' class='add-width'>
+      <div v-if='detailDate.controlType === "2"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type === "pull"'>
             <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -109,9 +109,9 @@
         </div>
       </div>
 <!--      纯下拉多选-->
-      <div v-if='detailDate.controlType === "3"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
-          <div v-if='item.type==="pull_more"' class='add-width'>
+      <div v-if='detailDate.controlType === "3"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -123,11 +123,11 @@
         </div>
       </div>
 <!--      纯附件-->
-      <div v-if='detailDate.controlType === "4"'>
-        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1'>
-          <div v-if='item.type==="file"' class='add-width'>
+      <div v-if='detailDate.controlType === "4"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' style='flex: 1' class='add-width'>
+          <div v-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
-                      @click="clickButtonToUpload(item)"  :disabled="item.isLock == '1' ? true: false">
+                      @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
               item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
             </a-button>
@@ -135,9 +135,9 @@
         </div>
       </div>
 <!--      文本+下拉单选-->
-      <div v-if='detailDate.controlType === "5"'>
-        <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type==="pull"' class='add-width'>
+      <div v-if='detailDate.controlType === "5"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
             <a-select v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
                     <span style="display: inline-block;width: 100%" :title=" itemin.label ">
@@ -146,7 +146,7 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="text"' class='add-width'>
+          <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -238,110 +238,8 @@
       </div>
 <!--      文本+下拉多选-->
       <div v-if='detailDate.controlType === "6"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index'>
-          <div v-if='item.type==="text"' class='add-width'>
-            <!--            文本校验  分情况-->
-            <!--            1 无-->
-            <!--            2 中文-->
-            <!--            3 正整数-->
-            <!--            4 政府点数-->
-            <!--            5 证书或小数-->
-            <!--            6 一位小数-->
-            <!--            7 两位小数-->
-            <!--            8 三位小数-->
-            <!--            9 四为小数-->
-            <!--           无 -->
-            <div v-if="item.controlVerify == '1'" class='add-width'>
-              <a-input class="box-input inputWid"
-                       :disabled="item.isLock == '1' ? true: false"
-                       :placeholder="$t('pleaseEnter')"
-                       v-model="item.dataValue" />
-            </div>
-            <!--            中文-->
-            <div v-if="item.controlVerify == '2'" class='add-width'>
-              <a-input class="box-input inputWid"
-                       :disabled="item.isLock == '1' ? true: false"
-                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
-                       v-model="item.dataValue" />
-            </div>
-            <!--         正整数  -->
-            <div v-if="item.controlVerify == '3'" class='add-width'>
-              <a-input-number class="box-input inputWid add--number"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :precision="0"
-                              :placeholder="$t('enterPositiveInteger')"
-                              v-model="item.dataValue" />
-            </div>
-            <!--         正浮点书  -->
-            <div v-if="item.controlVerify == '4'" class='add-width'>
-              <a-input class="box-input inputWid"
-                       :disabled="item.isLock == '1' ? true: false"
-                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
-                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
-                       v-model="item.dataValue" />
-            </div>
-            <!--         整数或小数  -->
-            <div v-if="item.controlVerify == '5'" class='add-width'>
-              <a-input-number class="box-input inputWid add--number"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
-                              v-model="item.dataValue" />
-            </div>
-            <!--        一位小数    -->
-            <div v-if="item.controlVerify == '6'" class='add-width'>
-              <a-input-number class="box-input inputWid add--number"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :precision="1"
-                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
-                              v-model="item.dataValue" />
-            </div>
-            <!--            两位小数-->
-            <div v-if="item.controlVerify == '7'" class='add-width'>
-              <a-input-number class="box-input inputWid add--number"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :precision="2"
-                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
-                              v-model="item.dataValue" />
-            </div>
-            <!--            三位小数-->
-            <div v-if="item.controlVerify == '8'" class='add-width'>
-              <a-input-number class="box-input inputWid"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :precision="3"
-                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
-                              v-model="item.dataValue" />
-            </div>
-            <!--            四位小数-->
-            <div v-if="item.controlVerify == '9'" class='add-width'>
-              <a-input-number class="box-input inputWid add--number"
-                              :disabled="item.isLock == '1' ? true: false"
-                              :max="99999"
-                              :precision="4"
-                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
-                              v-model="item.dataValue" />
-            </div>
-          </div>
-          <div v-if='item.type==="pull_more"' class='add-width'>
-            <a-select v-model="item.dataValue" mode="multiple" class='selectWid add-width'  :disabled="item.isLock == '1' ? true: false" allowClear>
-              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
-                    <span style="display: inline-block;width: 100%" :title=" item.label ">
-                      {{ item.label }}
-                    </span>
-              </a-select-option>
-            </a-select>
-          </div>
-        </div>
-      </div>
-<!--      文本+附件-->
-      <div v-if='detailDate.controlType === "7"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="text"' class='add-width'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -412,7 +310,7 @@
             </div>
             <!--            三位小数-->
             <div v-if="item.controlVerify == '8'">
-              <a-input-number class="box-input inputWid add--number"
+              <a-input-number class="box-input inputWid"
                               :disabled="item.isLock == '1' ? true: false"
                               :max="99999"
                               :precision="3"
@@ -429,41 +327,7 @@
                               v-model="item.dataValue" />
             </div>
           </div>
-          <div v-if='item.type==="file"' class='add-width'>
-            <a-button type="primary" class="button-text inputWid"
-                      @click="clickButtonToUpload(item)"  :disabled="item.isLock == '1' ? true: false">
-              {{ (item.dataValue === 'null' || item.dataValue === '' ||
-              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-            </a-button>
-          </div>
-        </div>
-      </div>
-<!--      下拉单选+附件-->
-      <div v-if='detailDate.controlType === "8"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="pull"' class='add-width'>
-            <a-select v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
-              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
-                    <span style="display: inline-block;width: 100%" :title=" itemin.label ">
-                      {{ itemin.label }}
-                    </span>
-              </a-select-option>
-            </a-select>
-          </div>
-          <div v-if='item.type==="file"' class='add-width'>
-            <a-button type="primary" class="button-text inputWid"
-                      :disabled="item.isLock == '1' ? true: false"
-                      @click="clickButtonToUpload(item)">
-              {{ (item.dataValue === 'null' || item.dataValue === '' ||
-              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-            </a-button>
-          </div>
-        </div>
-      </div>
-<!--      下拉多选+附件-->
-      <div v-if='detailDate.controlType === "9"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="pull_more"' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
             <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
               <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
                     <span style="display: inline-block;width: 100%" :title=" item.label ">
@@ -472,29 +336,12 @@
               </a-select-option>
             </a-select>
           </div>
-          <div v-if='item.type==="file"' class='add-width'>
-            <a-button type="primary" class="button-text inputWid"
-                      :disabled="item.isLock == '1' ? true: false"
-                      @click="clickButtonToUpload(item)">
-              {{ (item.dataValue === 'null' || item.dataValue === '' ||
-              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
-            </a-button>
-          </div>
         </div>
       </div>
-<!--      文本+下拉单选+附件-->
-      <div v-if='detailDate.controlType === "10"' class='add_flex'>
-        <div v-for='(item,index) in detailDate.list' :key='index' class='add_flex_item'>
-          <div v-if='item.type==="pull"'>
-            <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
-              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
-                    <span style="display: inline-block;width: 100%" :title=" itemin.label ">
-                      {{ itemin.label }}
-                    </span>
-              </a-select-option>
-            </a-select>
-          </div>
-          <div v-if='item.type==="text"' class='add-width'>
+<!--      文本+附件-->
+      <div v-if='detailDate.controlType === "7"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="text"'>
             <!--            文本校验  分情况-->
             <!--            1 无-->
             <!--            2 中文-->
@@ -584,7 +431,158 @@
           </div>
           <div v-if='item.type==="file"'>
             <a-button type="primary" class="button-text inputWid"
-                      @click="clickButtonToUpload(item)" :disabled="item.isLock == '1' ? true: false">
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+<!--      下拉单选+附件-->
+      <div v-if='detailDate.controlType === "8"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
+            <a-select v-model="item.dataValue" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
+                    <span style="display: inline-block;width: 100%" :title=" itemin.label ">
+                      {{ itemin.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+<!--      下拉多选+附件-->
+      <div v-if='detailDate.controlType === "9"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull_more"'>
+            <a-select v-model="item.dataValue" mode="multiple" class='selectWid'  :disabled="item.isLock == '1' ? true: false" allowClear>
+              <a-select-option v-for="(item, key) in item.controlValue" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.label ">
+                      {{ item.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
+              {{ (item.dataValue === 'null' || item.dataValue === '' ||
+              item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
+            </a-button>
+          </div>
+        </div>
+      </div>
+<!--      文本+下拉单选+附件-->
+      <div v-if='detailDate.controlType === "10"' class='add_flex'>
+        <div v-for='(item,index) in detailDate.list' :key='index' class='add-width'>
+          <div v-if='item.type==="pull"'>
+            <a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false" allowClear>
+              <a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
+                    <span style="display: inline-block;width: 100%" :title=" itemin.label ">
+                      {{ itemin.label }}
+                    </span>
+              </a-select-option>
+            </a-select>
+          </div>
+          <div v-if='item.type==="text"'>
+            <!--            文本校验  分情况-->
+            <!--            1 无-->
+            <!--            2 中文-->
+            <!--            3 正整数-->
+            <!--            4 政府点数-->
+            <!--            5 证书或小数-->
+            <!--            6 一位小数-->
+            <!--            7 两位小数-->
+            <!--            8 三位小数-->
+            <!--            9 四为小数-->
+            <!--           无 -->
+            <div v-if="item.controlVerify == '1'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--            中文-->
+            <div v-if="item.controlVerify == '2'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       :placeholder="$t('pleaseEnter')+$t('chinese')"
+                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         正整数  -->
+            <div v-if="item.controlVerify == '3'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="0"
+                              :placeholder="$t('enterPositiveInteger')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--         正浮点书  -->
+            <div v-if="item.controlVerify == '4'">
+              <a-input class="box-input inputWid"
+                       :disabled="item.isLock == '1' ? true: false"
+                       onkeyup="value=value.replace(/^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$/g,'')"
+                       :placeholder="$t('pleaseEnter')+$t('Positivefloatingpointnumber')"
+                       v-model="item.dataValue" />
+            </div>
+            <!--         整数或小数  -->
+            <div v-if="item.controlVerify == '5'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :placeholder="$t('pleaseEnter')+$t('integerOrDecimal')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--        一位小数    -->
+            <div v-if="item.controlVerify == '6'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="1"
+                              :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            两位小数-->
+            <div v-if="item.controlVerify == '7'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="2"
+                              :placeholder="$t('pleaseEnter')+$t('TwoDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            三位小数-->
+            <div v-if="item.controlVerify == '8'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="3"
+                              :placeholder="$t('pleaseEnter')+$t('Threedecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+            <!--            四位小数-->
+            <div v-if="item.controlVerify == '9'">
+              <a-input-number class="box-input inputWid add--number"
+                              :disabled="item.isLock == '1' ? true: false"
+                              :max="99999"
+                              :precision="4"
+                              :placeholder="$t('pleaseEnter')+$t('FourDecimalplaces')"
+                              v-model="item.dataValue" />
+            </div>
+          </div>
+          <div v-if='item.type==="file"'>
+            <a-button type="primary" class="button-text inputWid"
+                      @click="clickButtonToUpload(item)">
               {{ (item.dataValue === 'null' || item.dataValue === '' ||
               item.dataValue == null) ? $t('clickUpload') : $t('viewUploadedFiles')}}
             </a-button>
@@ -707,7 +705,6 @@ export default {
 .add_flex_item{
   width: 30%;
   flex: 1;
-  margin-right: 15px;
 }
 .selectWid{
   min-width: 150px;
@@ -717,7 +714,6 @@ export default {
 }
 .add-width{
   width: 30%;
-  margin-right: 15px;
 }
 .add--number{
   width: 101%;
diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue
index 1b228aa76..3f08521d0 100644
--- a/jero-web/src/components/uploadFileChangeDown/file.vue
+++ b/jero-web/src/components/uploadFileChangeDown/file.vue
@@ -59,6 +59,7 @@ export default {
     }
   },
   created() {
+    console.log(this.detailDate,'detailDate')
     const token = Vue.ls.get(ACCESS_TOKEN)
     this.headers = { 'X-Access-Token': token }
     this.containerId = 'container-ty-' + new Date().getTime()
@@ -95,8 +96,6 @@ export default {
       }
     },
     beforeUpload(file) {
-
-      console.log(file)
       // let thisFileType = this.thisFileType.replace(/\s+/g, "");
       this.fileTypeSatus = true
       //TODO 客户要求不拦截文件
@@ -125,6 +124,12 @@ export default {
       window.open(url, '_blank')
     },
     handleChange(info) {
+      // this.detailDate.list.forEach((item) => {
+      //   if(item.isLock === '1'){
+      //     this.$message.warning(this.$t('Frozenstatus'))
+      //     return
+      //   }
+      // })
       if(info.fileList.length > 1) {
         this.$message.warning(this.$t('onlyOnefileUploaded'))
         return