Bladeren bron

社区机构

nanMing 2 jaren geleden
bovenliggende
commit
3eccaeffb7

+ 31 - 30
ruoyi-ui/src/views/organization/jggl/sqJcxx/index.vue

@@ -185,7 +185,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.qtcws"
+                v-model="form.qtcws"
                 placeholder="全托床位数量"
                 :min="0"
                 :max="999999"
@@ -198,7 +198,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.rtcws"
+                v-model="form.rtcws"
                 placeholder="日托床位数量"
                 :min="0"
                 :max="999999"
@@ -207,7 +207,7 @@
             </el-form-item>
             <el-form-item label="床位总数(个)" prop="cwzs" class="formWidth">
               <number
-                v-model.sync="form.cwzs"
+                v-model="form.cwzs"
                 placeholder="床位总数"
                 :disabled="true"
                 :min="0"
@@ -223,7 +223,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.hlxcws"
+                v-model="form.hlxcws"
                 placeholder="护理型床位数量"
                 :min="0"
                 :max="999999"
@@ -232,7 +232,7 @@
             </el-form-item>
             <el-form-item label="建筑面积(㎡)" prop="jzmj" class="formWidth">
               <number
-                v-model.sync="form.jzmj"
+                v-model="form.jzmj"
                 placeholder="建筑面积"
                 :min="0"
                 :max="99999999"
@@ -241,7 +241,7 @@
             </el-form-item>
             <el-form-item label="占地面积(㎡)" prop="zdmj" class="formWidth">
               <number
-                v-model.sync="form.zdmj"
+                v-model="form.zdmj"
                 placeholder="占地面积"
                 :min="0"
                 :max="99999999"
@@ -373,7 +373,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.rzlnrs"
+                v-model="form.rzlnrs"
                 placeholder="入住老年人数"
                 :min="0"
                 :max="10000000000"
@@ -386,7 +386,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.zllnrszfy"
+                v-model="form.zllnrszfy"
                 placeholder="自理老年人收住费用/月"
                 :min="0"
                 :max="10000000000"
@@ -399,7 +399,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.bfsnlnrszfy"
+                v-model="form.bfsnlnrszfy"
                 placeholder="部分失能老年人收住费用/月"
                 :min="0"
                 :max="10000000000"
@@ -409,18 +409,18 @@
           </div>
           <div class="formFlex">
             <!--            <el-form-item label="入住老年人数" prop="rzlnrs">-->
-            <!--              <number placeholder="入住老年人数" v-model.sync="form.rzlnrs" :min="0" :max="100" />-->
+            <!--              <number placeholder="入住老年人数" v-model="form.rzlnrs" :min="0" :max="100" />-->
             <!--            </el-form-item>-->
             <!--            <el-form-item label="自理老年人收住费用/月" prop="zllnrszfy">-->
-            <!--              <number placeholder="自理老年人收住费用/月" v-model.sync="form.zllnrszfy" :min="0" :max="10000000000" :precision="2"/>-->
+            <!--              <number placeholder="自理老年人收住费用/月" v-model="form.zllnrszfy" :min="0" :max="10000000000" :precision="2"/>-->
             <!--            </el-form-item>-->
             <!--            <el-form-item label="部分失能老年人收住费用/月" prop="bfsnlnrszfy">-->
-            <!--              <number placeholder="部分失能老年人收住费用/月" v-model.sync="form.bfsnlnrszfy" :min="0" :max="10000000000" :precision="2"/>-->
+            <!--              <number placeholder="部分失能老年人收住费用/月" v-model="form.bfsnlnrszfy" :min="0" :max="10000000000" :precision="2"/>-->
             <!--            </el-form-item>-->
             <el-form-item label="失能老年人收住费用/月" prop="snlnrszfy">
               <number
                 placeholder="失能老年人收住费用/月"
-                v-model.sync="form.snlnrszfy"
+                v-model="form.snlnrszfy"
                 :min="0"
                 :max="10000000000"
                 :precision="2"
@@ -429,7 +429,7 @@
             <el-form-item label="服务人次/月" prop="fwrc">
               <number
                 placeholder="服务人次/月"
-                v-model.sync="form.fwrc"
+                v-model="form.fwrc"
                 :min="0"
                 :max="100000"
               />
@@ -672,7 +672,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwQtrc"
+                v-model="form.tgsqylfwQtrc"
                 placeholder="全托服务人次"
                 :disabled="isYL"
                 :min="0"
@@ -687,7 +687,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwRtrc"
+                v-model="form.tgsqylfwRtrc"
                 placeholder="日托(日间照料)人次"
                 :disabled="isYL"
                 :min="0"
@@ -702,7 +702,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwCzrc"
+                v-model="form.tgsqylfwCzrc"
                 placeholder="老年餐桌(食堂)人次"
                 :disabled="isYL"
                 :min="0"
@@ -720,7 +720,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwWyrc"
+                v-model="form.tgsqylfwWyrc"
                 placeholder="社区文化娱乐人次"
                 :disabled="isYL"
                 :min="0"
@@ -735,7 +735,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwZfrc"
+                v-model="form.tgsqylfwZfrc"
                 placeholder="时间银行(志愿服务)人次"
                 :disabled="isYL"
                 :min="0"
@@ -750,7 +750,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwKfrc"
+                v-model="form.tgsqylfwKfrc"
                 placeholder="社区康复服务人次"
                 :disabled="isYL"
                 :min="0"
@@ -767,7 +767,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgsqylfwQtfwrc"
+                v-model="form.tgsqylfwQtfwrc"
                 placeholder="其他服务内容人次"
                 :disabled="isYL"
                 :min="0"
@@ -786,7 +786,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwCwrc"
+                v-model="form.tgjjylsmfwCwrc"
                 placeholder="家庭养老床位服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -801,7 +801,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwZcrc"
+                v-model="form.tgjjylsmfwZcrc"
                 placeholder="上门助餐服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -817,7 +817,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwZjrc"
+                v-model="form.tgjjylsmfwZjrc"
                 placeholder="上门助洁服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -835,7 +835,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwZxrc"
+                v-model="form.tgjjylsmfwZxrc"
                 placeholder="上门助行服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -851,7 +851,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwXyrc"
+                v-model="form.tgjjylsmfwXyrc"
                 placeholder="上门助浴服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -867,7 +867,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwKfrc"
+                v-model="form.tgjjylsmfwKfrc"
                 placeholder="上门康复服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -884,7 +884,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwZyrc"
+                v-model="form.tgjjylsmfwZyrc"
                 placeholder="上门助医服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -900,7 +900,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwGarc"
+                v-model="form.tgjjylsmfwGarc"
                 placeholder="巡访关爱服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -916,7 +916,7 @@
               class="formWidth"
             >
               <number
-                v-model.sync="form.tgjjylsmfwQtrc"
+                v-model="form.tgjjylsmfwQtrc"
                 placeholder="其他上门服务人次"
                 :disabled="isFW"
                 :min="0"
@@ -1888,6 +1888,7 @@ export default {
         }
         getData(id).then(response => {
           this.loading = false
+          let data = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
           this.form = {szlrlx:'',nsyljg:'',yljgqyhz:'',fcyhznr:'',szlrlxQt:'',...response.data}
           this.form.szlrlx = this.form.szlrlx ? this.form.szlrlx.split(',') : []
           this.form.nsyljg = this.form.nsyljg ? this.form.nsyljg.split(',') : []

+ 1 - 2
ruoyi-ui/src/views/organization/kugl/khjbxx/index.vue

@@ -1274,8 +1274,7 @@ export default {
       copyParams.cjlx.length > 0 && (copyParams.cjlx = copyParams.cjlx.join(','))
 
       advancedListKhxxBySqJg(copyParams).then(response => {
-        // this.khjbxxList = this.$decryptRowData(response.rows, ["xm", "zjhm", "xjd"], [1, 2, 4]);
-        this.khjbxxList = response.rows
+        this.khjbxxList = decryptRowData_ECB(response.rows, ["xm", "zjhm", "xjd"], [1, 2, 4]);
         console.log('advancedList', this.khjbxxList);
         this.total = response.total
         this.loading = false

+ 97 - 108
ruoyi-ui/src/views/organization/zwyw/babgsq/module/index.vue

@@ -35,7 +35,7 @@
     <el-table v-loading="loading" :data="bnList">
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
-          {{(queryParams.pageNum-1)*queryParams.pageSize + scope.$index + 1}}
+          {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" />
@@ -58,7 +58,7 @@
       <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <!---->
-          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.bnLzzt==='00'"
+          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.bnLzzt === '00'"
             @click="handleUpdate(scope.row)" v-hasPermi="['organization:bnbg:edit']">继续填写
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['organization:bn:changeQuery']"
@@ -69,7 +69,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 添加或修改机构备案对话框 -->
@@ -195,22 +195,22 @@
                 <el-form-item label="备案申请书" prop="bhsqs" class="formWidth2">
                   <!--<image-upload v-model="form.bhsqs" />-->
                   <file-upload v-model="form.bhsqs" :isShowTip="false" :limit="1" :fileSize="8"
-                    :fileType="['jpg','jpeg','png','doc','docx','pdf']"></file-upload>
+                    :fileType="['jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf']"></file-upload>
                 </el-form-item>
                 <el-form-item label="养老机构登记证书" prop="jgdjzs" class="formWidth2">
                   <file-upload v-model="form.jgdjzs" :isShowTip="false" :limit="1" :fileSize="8"
-                    :fileType="['jpg','jpeg','png','doc','docx','pdf']" />
+                    :fileType="['jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf']" />
                 </el-form-item>
 
               </div>
               <div class="formFlex">
                 <el-form-item label="承诺书" prop="cns" class="formWidth2">
                   <file-upload v-model="form.cns" :isShowTip="false" :limit="1" :fileSize="8"
-                    :fileType="['jpg','jpeg','png','doc','docx','pdf']" />
+                    :fileType="['jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf']" />
                 </el-form-item>
                 <el-form-item label="其他材料" prop="qtcl" class="formWidth2">
                   <file-upload v-model="form.qtcl" :isShowTip="false" :fileSize="8"
-                    :fileType="['jpg','jpeg','png','doc','docx','pdf']" />
+                    :fileType="['jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf']" />
                 </el-form-item>
               </div>
               <div class="formFlex">
@@ -253,7 +253,7 @@
                 <el-form-item label="收住老人类型" prop="szlrlx" class="formWidth4">
                   <el-checkbox-group v-model="form.szlrlx" @change="getSzlrlx(form.szlrlx)">
                     <el-checkbox v-for="dict in dict.type.CH052" :key="dict.value" :label="dict.value">
-                      {{dict.label}}
+                      {{ dict.label }}
                     </el-checkbox>
                   </el-checkbox-group>
                 </el-form-item>
@@ -266,7 +266,7 @@
               <div class="formFlex">
                 <el-form-item label="是否投保责任险" prop="isTbzrx" class="formWidth2">
                   <el-radio-group v-model="form.isTbzrx">
-                    <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{dict.label}}
+                    <el-radio v-for="dict in dict.type.CZ035" :key="dict.value" :label="dict.value">{{ dict.label }}
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -325,7 +325,7 @@
                   <el-input v-model="form.babgMs" type="textarea" maxlength="400" show-word-limit
                     placeholder="请输入变更原因描述" />
                 </el-form-item>
-                <el-form-item label="备案人联系方式" prop="babgLxfs" class="formWidth">
+                <el-form-item label="申请人联系方式" prop="babgLxfs" class="formWidth">
                   <el-input v-model="form.babgLxfs" placeholder="请输入备案人联系方式" />
                 </el-form-item>
                 <el-checkbox v-model="checked" @change="changeCheckedBg(checked)">是否与法人一致</el-checkbox>
@@ -341,23 +341,24 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
     <!-- 办理和详情对话框 -->
     <el-dialog v-dialog-drag :title="title" v-if="openBl" :visible.sync="openBl" width="1600px" append-to-body>
       <el-scrollbar wrapClass="scrollbar-wrap1">
         <div><span class="red">*红色字体</span>代表变更的信息,鼠标放在<span class="red">红色字体</span>上可展示变更的信息</div>
         <div v-for="(item) in xqList" :key="item.title">
-          <h3>{{item.title}}</h3>
+          <h3>{{ item.title }}</h3>
           <table>
-            <tr v-for="(ite,inde) in item.data" :key="inde">
-              <td v-for="(it,i) in ite" :key="i">
-                <div v-if="it.type==='file'">
+            <tr v-for="(ite, inde) in item.data" :key="inde">
+              <td v-for="(it, i) in ite" :key="i">
+                <div v-if="it.type === 'file'">
                   <!--<file-upload v-if="it.value&&it.value[0]" v-model="it.value[0]" :isFile="false"/>-->
                   <!--<div v-else>暂无资料</div>-->
-                  <el-tooltip v-if="it.value&&it.value[0]" class="item" effect="dark"
-                    :disabled="it.value.length>1?false:true" :content="'变更前:'+(it.value[1]==null?'无':it.value[1])"
-                    placement="top">
-                    <div :style="{color:it.value.length>1?'#ff0000':''}">
-                      <file-upload v-if="it.value&&it.value[0]" v-model="it.value[0]" :isFile="false" />
+                  <el-tooltip v-if="it.value && it.value[0]" class="item" effect="dark"
+                    :disabled="it.value.length > 1 ? false : true"
+                    :content="'变更前:' + (it.value[1] == null ? '无' : it.value[1])" placement="top">
+                    <div :style="{ color: it.value.length > 1 ? '#ff0000' : '' }">
+                      <file-upload v-if="it.value && it.value[0]" v-model="it.value[0]" :isFile="false" />
                       <div v-else>暂无资料</div>
                     </div>
                   </el-tooltip>
@@ -365,15 +366,15 @@
                 </div>
                 <div v-else>
                   <div v-if="Array.isArray(it.value)">
-                    <el-tooltip class="item" effect="dark" :disabled="it.value.length>1?false:true"
-                      :content="'变更前:'+(it.value[1]==null?'无':it.value[1])" placement="top">
-                      <div :style="{color:it.value.length>1?'#ff0000':''}">
-                        {{it.value[0]==null?'无':it.value[0]}}
+                    <el-tooltip class="item" effect="dark" :disabled="it.value.length > 1 ? false : true"
+                      :content="'变更前:' + (it.value[1] == null ? '无' : it.value[1])" placement="top">
+                      <div :style="{ color: it.value.length > 1 ? '#ff0000' : '' }">
+                        {{ it.value[0] == null ? '无' : it.value[0] }}
                       </div>
                     </el-tooltip>
                   </div>
                   <div v-else>
-                    {{it.value}}
+                    {{ it.value }}
                   </div>
                 </div>
               </td>
@@ -402,72 +403,36 @@
                   </el-form-item>
                 </div>
 
-                <div v-if="form.bljg==='2'">
+                <div v-if="form.bljg === '2'">
                   <el-form-item label="备案不通过原因" prop="babtgyy">
                     <el-checkbox-group v-model="form.babtgyy" @change="getBabtgyy(form.babtgyy)">
                       <el-checkbox v-for="dict in dict.type.XZ065" :key="dict.value" :label="dict.value">
-                        {{dict.label}}
+                        {{ dict.label }}
                       </el-checkbox>
                     </el-checkbox-group>
                   </el-form-item>
                   <div class="formFlex">
-                    <el-form-item label="具体材料名称" class="formWidth" prop="jtclmc" v-if="form.babtgyy.indexOf('1')!==-1">
+                    <el-form-item label="具体材料名称" class="formWidth" prop="jtclmc"
+                      v-if="form.babtgyy.indexOf('1') !== -1">
                       <el-input v-model="form.jtclmc" placeholder="请输入具体材料名称" />
                     </el-form-item>
 
                     <el-form-item label="具体不正确得信息" class="formWidth" prop="jtbzqxx"
-                      v-if="form.babtgyy.indexOf('2')!==-1">
+                      v-if="form.babtgyy.indexOf('2') !== -1">
                       <el-input v-model="form.jtbzqxx" placeholder="请输入具体不正确得信息" />
                     </el-form-item>
 
-                    <el-form-item label="具体原因" class="formWidth" prop="jtyy" v-if="form.babtgyy.indexOf('3')!==-1">
+                    <el-form-item label="具体原因" class="formWidth" prop="jtyy" v-if="form.babtgyy.indexOf('3') !== -1">
                       <el-input v-model="form.jtyy" placeholder="请输入具体原因" />
                     </el-form-item>
                   </div>
-
                 </div>
-
               </div>
-
             </div>
-
-            <!--<div>-->
-            <!--<h3>-->
-            <!--&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;这里是目前还需所填写的字段&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
-            <!--</h3>-->
-            <!--<div class="formBox">-->
-            <!--<div class="formFlex">-->
-            <!--<el-form-item label="申请渠道" prop="sqqd">-->
-            <!--&lt;!&ndash;                <el-input v-model="form.sqqd" placeholder="请输入申请渠道" />&ndash;&gt;-->
-            <!--<el-select v-model="form.sqqd" placeholder="请选择申请渠道">-->
-            <!--<el-option-->
-            <!--v-for="dict in dict.type.XZ036"-->
-            <!--:key="dict.value"-->
-            <!--:label="dict.label"-->
-            <!--:value="dict.value"-->
-            <!--&gt;</el-option>-->
-            <!--</el-select>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="备案创建状态" prop="bnCjzt">-->
-            <!--<el-input v-model="form.bnCjzt" placeholder="请输入备案创建状态"/>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="流转状态" prop="bnLzzt">-->
-            <!--<el-select v-model="form.bnLzzt" placeholder="请选择流转状态">-->
-            <!--<el-option-->
-            <!--v-for="dict in dict.type.XZ070"-->
-            <!--:key="dict.value"-->
-            <!--:label="dict.label"-->
-            <!--:value="dict.value"-->
-            <!--&gt;</el-option>-->
-            <!--</el-select>-->
-            <!--</el-form-item>-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--</div>-->
           </el-form>
           <div class="footer">
             <el-button type="primary" @click="submitFormBL" :loading="submitFormLoading">提 交</el-button>
-            <el-button @click="openBl=false">取 消</el-button>
+            <el-button @click="openBl = false">取 消</el-button>
           </div>
         </div>
       </el-scrollbar>
@@ -479,16 +444,17 @@
 <script>
 import { addBn, delBn, getBn, getChangeBn, listBn, updateBn } from '@/api/organization/jggl/bn'
 import { getJcxx } from '@/api/organization/jggl/jcxx'
-import { chineseOne, idCard, Regular } from '@/utils/regular'
+import { chineseOne, idCard, Mobile } from '@/utils/regular'
 import { Constant } from '@/utils/constant'
 import { mapState } from 'vuex'
-import { decryptData_ECB, decryptRowData_ECB } from "@/api/tool/sm4";
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
   name: 'Module',
   dicts: ['CH010', 'CZ035', 'XZ036', 'CH052', 'CZ005', 'CZ026', 'CZ004', 'C0038', 'C0015', 'CH012', 'CH007', 'CH009', 'XZ065', 'XZ070'],
   data() {
     return {
+      decodeStr: {},
       props: {
         emitPath: false,
         checkStrictly: true
@@ -632,7 +598,7 @@ export default {
         barLxfs: [
           { required: true, message: '备案人联系方式不能为空', trigger: 'change' },
           { max: 11, message: '备案人联系方式不能超过11个字符', trigger: 'change' },
-          { pattern: Regular.Mobile, message: '投诉人手机号码格式不对', trigger: 'change' }
+          { validator: Mobile, trigger: 'change' }
         ],
 
         babgXm: [
@@ -650,7 +616,7 @@ export default {
         babgLxfs: [
           { required: true, message: '备案人联系方式不能为空', trigger: 'blur' },
           { max: 11, message: '备案人联系方式不能超过11个字符', trigger: 'blur' },
-          { pattern: Regular.Mobile, message: '投诉人手机号码格式不对', trigger: 'blur' }
+          { validator: Mobile, trigger: 'blur' }
         ],
         babgMs: [
           { required: true, message: '变更原因描述不能为空', trigger: 'blur' }
@@ -1064,8 +1030,7 @@ export default {
         if (row.bnLzzt === '03' || row.bnLzzt === '05') {
           this.xqList = [...this.xqList, this.baNOList]
         }
-        this.xqData = response.data
-        console.log(this.xqList);
+        this.xqData = decryptData_ECB(response.data, ['frxm', 'frzjhm', 'frlxfs', 'txdz', 'barXm', 'barZjhm', 'barLxfs', 'babgXm', 'babgSfzhm', 'babgLxfs'], [1, 2, 3, 4, 1, 2, 3, 1, 2, 3])
         this.xqList = this.xqList.map(items => {
           items.data = items.data.map(it => {
             return it.map(item => {
@@ -1281,39 +1246,46 @@ export default {
           this.$modal.msgWarning('该机构未存在备案,请勿变更申请')
           return false;
         }
-        // this.form = res.data
-        this.form.tyshxydm = res.data.tyshxydm
-        this.form.jgId = res.data.id
-        this.form.xydm = res.data.tyshxydm
-        this.form.jgmc = res.data.jgmc
-        this.form.jlrq = res.data.jlrq
-        this.form.ssxzqh = res.data.ssxzqh
-        this.form.txdz = res.data.txdz
-        this.form.frxm = res.data.frxm
-        this.form.frlxfs = res.data.frlxfs
-        this.form.dwxz = res.data.dwxz
-        this.form.xbzt = res.data.xbzt
-        this.form.isTbzrx = res.data.isTbzrx
-        this.form.frxm = res.data.frxm
-        this.form.frzjlx = res.data.frzjlx
-        this.form.frzjhm = res.data.frzjhm
-        this.form.frdjjg = res.data.frdjjg
-        this.form.frlx = res.data.frlx
-        this.form.csxz = res.data.csxz
-        this.form.scwz = res.data.scwz
-        this.form.qtcws = res.data.qtcws
-        this.form.rtcws = res.data.rtcws
-        this.form.hlxcws = res.data.hlxcws
-        this.form.cwzs = res.data.cwzs
-        this.form.ssxzqhName = res.data.ssxzqhName
-        this.form.jzmj = res.data.jzmj
-        this.form.zdmj = res.data.zdmj
-        this.form.jglxdh = res.data.frlxfs
-        this.form.szlrlxQt = res.data.szlrlxQt
-        res.data.szlrlx == null ? this.form.szlrlx = '' : this.form.szlrlx = res.data.szlrlx.split(',')
-        if (res.data.szxzqhName) {
+        this.decodeStr = {
+          frxm: decrypt_ECB(res.data.frxm),
+          frzjhm: decrypt_ECB(res.data.frzjhm),
+          frlxfs: decrypt_ECB(res.data.frlxfs),
+          txdz: decrypt_ECB(res.data.txdz),
+          jglxdh: decrypt_ECB(res.data.jglxdh),
+        }
+        let data = decryptData_ECB(res.data, ['frxm', 'frzjhm', 'frlxfs', 'txdz'], [1, 2, 3, 4])
+        this.form.tyshxydm = data.tyshxydm
+        this.form.jgId = data.id
+        this.form.xydm = data.tyshxydm
+        this.form.jgmc = data.jgmc
+        this.form.jlrq = data.jlrq
+        this.form.ssxzqh = data.ssxzqh
+        this.form.txdz = data.txdz
+        this.form.frxm = data.frxm
+        this.form.frlxfs = data.frlxfs
+        this.form.dwxz = data.dwxz
+        this.form.xbzt = data.xbzt
+        this.form.isTbzrx = data.isTbzrx
+        this.form.frxm = data.frxm
+        this.form.frzjlx = data.frzjlx
+        this.form.frzjhm = data.frzjhm
+        this.form.frdjjg = data.frdjjg
+        this.form.frlx = data.frlx
+        this.form.csxz = data.csxz
+        this.form.scwz = data.scwz
+        this.form.qtcws = data.qtcws
+        this.form.rtcws = data.rtcws
+        this.form.hlxcws = data.hlxcws
+        this.form.cwzs = data.cwzs
+        this.form.ssxzqhName = data.ssxzqhName
+        this.form.jzmj = data.jzmj
+        this.form.zdmj = data.zdmj
+        this.form.jglxdh = data.frlxfs
+        this.form.szlrlxQt = data.szlrlxQt
+        data.szlrlx == null ? this.form.szlrlx = '' : this.form.szlrlx = data.szlrlx.split(',')
+        if (data.szxzqhName) {
           // this.form.szxzqh = JSON.stringify(this.form.szxzqhName.split(','))
-          this.form.szxzqh = JSON.stringify(res.data.szxzqhName.split(','))
+          this.form.szxzqh = JSON.stringify(data.szxzqhName.split(','))
         } else {
           this.form.szxzqh = ''
         }
@@ -1387,7 +1359,7 @@ export default {
       // this.form.szlrlx = this.form.szlrlx.join(",");
       this.submitFormLoading = true
       if (this.form.id != null) {
-
+      console.log('aaaa');
         /****** sks 需要改动的地方 start ******/
         // let formData=this.comparisonObject(this.form,this.copyForm);
         let formData = this.comparisonObject({ ...this.form, ...pamar }, this.copyForm)
@@ -1405,8 +1377,25 @@ export default {
         }
         /****** sks 需要改动的地方 end ******/
       } else {
-        // addBn(this.form).then(response => {
-        addBn({ ...this.form, ...pamar }).then(response => {
+        console.log('bbbbb',this.checked);
+        let copyForm = {
+          ...this.form,
+          ...pamar,
+          frxm: this.decodeStr.frxm,
+          frzjhm: this.decodeStr.frzjhm,
+          frlxfs: this.decodeStr.frlxfs,
+          txdz: this.decodeStr.txdz,
+          jglxdh: this.decodeStr.jglxdh
+        }
+        if (this.checked) {
+          copyForm.barXm = this.decodeStr.frxm
+          copyForm.barZjhm = this.decodeStr.frzjhm
+          copyForm.barLxfs = this.decodeStr.frlxfs
+          copyForm.babgXm = this.decodeStr.frxm
+          copyForm.babgSfzhm = this.decodeStr.frzjhm
+          copyForm.babgLxfs = this.decodeStr.frlxfs
+        }
+        addBn(copyForm).then(response => {
           this.$modal.msgSuccess('新增成功')
           this.open = false
           this.getList()

+ 46 - 43
ruoyi-ui/src/views/organization/zwyw/djpdsq/bgdjpdSq/index.vue

@@ -126,17 +126,17 @@
             </td>
             <td>全托床位数(张):</td>
             <td>
-              <number v-model.sync="form.qtcw" :min="0" :max="100" :disabled="true" />
+              <number v-model="form.qtcw" :min="0" :max="100" :disabled="true" />
             </td>
           </tr>
           <tr>
             <td>日托床位数量:</td>
             <td>
-              <number v-model.sync="form.rtcw" :min="0" :max="100" :disabled="true" />
+              <number v-model="form.rtcw" :min="0" :max="100" :disabled="true" />
             </td>
             <td>护理床位数量:</td>
             <td>
-              <number v-model.sync="form.hlcw" :min="0" :max="100" :disabled="true" />
+              <number v-model="form.hlcw" :min="0" :max="100" :disabled="true" />
             </td>
           </tr>
           <tr>
@@ -208,13 +208,13 @@
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="服务设施面积" prop="ssmj" style="display: none">
-          <number placeholder="服务设施面积" v-model.sync="form.ssmj" :min="0" :max="100" />
+          <number placeholder="服务设施面积" v-model="form.ssmj" :min="0" :max="100" />
         </el-form-item>
         <el-form-item label="建筑面积" prop="jzmj" style="display: none">
-          <number placeholder="建筑面积" v-model.sync="form.jzmj" :min="0" :max="100" />
+          <number placeholder="建筑面积" v-model="form.jzmj" :min="0" :max="100" />
         </el-form-item>
         <el-form-item label="占地面积" prop="zdmj" style="display: none">
-          <number placeholder="占地面积" v-model.sync="form.zdmj" :min="0" :max="100" />
+          <number placeholder="占地面积" v-model="form.zdmj" :min="0" :max="100" />
         </el-form-item>
         <el-form-item label="是否区域养老中心" prop="isQyylzx" style="display: none">
           <el-select v-model="form.isQyylzx" placeholder="请选择是否区域养老中心">
@@ -417,8 +417,9 @@ import {
   updateBgdjpdSq
 } from "@/api/business/fwjggl/djpd/bgdjpdSq";
 import {getJgByUser} from '@/api/business/fwjggl/djpd/djpdSq'
-import {chineseOne, Regular} from '@/utils/regular'
+import {chineseOne, Mobile} from '@/utils/regular'
 import {mapState} from "vuex";
+import { decryptData_ECB, decryptRowData_ECB, decrypt_ECB } from "@/api/tool/sm4";
 
 export default {
   name: "BgdjpdSq",
@@ -505,7 +506,7 @@ export default {
         ],
         sjhm: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
-          { pattern: Regular.Mobile, message: "手机号格式不对", trigger: "blur" },
+          { validator: Mobile, trigger: 'blur' },
         ],
       }
     };
@@ -675,42 +676,44 @@ export default {
             if (res.data.szlrlx == null || res.data.szlrlx == '') {
               return this.$modal.msgWarning("请先备案再开启等级评定变更申请");
             }
+            let data = decryptData_ECB(res.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4])
+            console.log(data);
             this.open = true;
-            this.searchXydm = res.data.tyshxydm;
-            this.form.jgId = res.data.id;
-            this.form.sqId = res.data.sqId;
-            this.form.xydm = res.data.tyshxydm;
-            this.form.dwmc = res.data.jgmc;
-            this.form.jlrq = res.data.jlrq;
-            this.form.szxzqh = res.data.ssxzqh;
-            this.form.szxzqhId = res.data.ssxzqhCode;
-            this.form.dwssxzqhId = res.data.ssxzqhCode;
-            this.form.txdz = res.data.txdz;
-            this.form.jglxrxm = res.data.frxm;
-            this.form.jgfzrxm = res.data.jgfzr;
-            this.form.jgfzrlxdh = res.data.frlxfs;
-            this.form.frxm = res.data.frxm;
-            this.form.frzjlx = res.data.frzjlx;
-            this.form.frzjhm = res.data.frzjhm;
-            this.form.frlxfs = res.data.frlxfs;
-            this.form.frdjjg = res.data.frdjjg;
-            this.form.frxz = res.data.frlx;
-            this.form.fwcsxz = res.data.csxz;
-            this.form.scwz = res.data.scwz;
-            this.form.qtcw = res.data.qtcws;
-            this.form.rtcw = res.data.rtcws;
-            this.form.hlcw = res.data.hlxcws;
-            this.form.szlx = res.data.szlrlx.split(",");
-            this.form.ssmj = res.data.jzmj;
-            this.form.jzmj = res.data.jzmj;
-            this.form.zdmj = res.data.zdmj;
-            this.form.jglxdh = res.data.frlxfs;
-            this.form.isQyylzx = res.data.is_qyxylfwzx;
-            this.form.lastPddj = res.data.last_pddj;
-            this.form.sqdj = res.data.last_sqdj;
-            this.form.pddj = res.data.last_pddj;
-            this.form.isTbzrx = res.data.is_tbzrx;
-            this.form.isSmfw = res.data.is_tgjjylsmfw;
+            this.searchXydm = data.tyshxydm;
+            this.form.jgId = data.id;
+            this.form.sqId = data.sqId;
+            this.form.xydm = data.tyshxydm;
+            this.form.dwmc = data.jgmc;
+            this.form.jlrq = data.jlrq;
+            this.form.szxzqh = data.ssxzqh;
+            this.form.szxzqhId = data.ssxzqhCode;
+            this.form.dwssxzqhId = data.ssxzqhCode;
+            this.form.txdz = data.txdz;
+            this.form.jglxrxm = data.frxm;
+            this.form.jgfzrxm = data.jgfzr;
+            this.form.jgfzrlxdh = data.frlxfs;
+            this.form.frxm = data.frxm;
+            this.form.frzjlx = data.frzjlx;
+            this.form.frzjhm = data.frzjhm;
+            this.form.frlxfs = data.frlxfs;
+            this.form.frdjjg = data.frdjjg;
+            this.form.frxz = data.frlx;
+            this.form.fwcsxz = data.csxz;
+            this.form.scwz = data.scwz;
+            this.form.qtcw = data.qtcws;
+            this.form.rtcw = data.rtcws;
+            this.form.hlcw = data.hlxcws;
+            this.form.szlx = data.szlrlx.split(",");
+            this.form.ssmj = data.jzmj;
+            this.form.jzmj = data.jzmj;
+            this.form.zdmj = data.zdmj;
+            this.form.jglxdh = data.frlxfs;
+            this.form.isQyylzx = data.is_qyxylfwzx;
+            this.form.lastPddj = data.last_pddj;
+            this.form.sqdj = data.last_sqdj;
+            this.form.pddj = data.last_pddj;
+            this.form.isTbzrx = data.is_tbzrx;
+            this.form.isSmfw = data.is_tgjjylsmfw;
           } else {
             this.$modal.msgWarning("无效的机构");
           }

+ 100 - 9
ruoyi-ui/src/views/organization/zwyw/djpdsq/djpdSq/index.vue

@@ -47,7 +47,7 @@
       <el-table-column label="序号" align="center">
         <template slot-scope="scope">
           {{
-          (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+              (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}
         </template>
       </el-table-column>
@@ -183,6 +183,7 @@ export default {
   ],
   data() {
     return {
+      decodeStr: {},
       // 遮罩层
       loading: true,
       submitFormLoading: false,
@@ -425,6 +426,12 @@ export default {
             if (res.data.szlrlx == null || res.data.szlrlx == '') {
               return this.$modal.msgWarning("请先备案再开启等级评定");
             }
+            this.decodeStr = {
+              frxm: decrypt_ECB(res.data.frxm),
+              frzjhm: decrypt_ECB(res.data.frzjhm),
+              frlxfs: decrypt_ECB(res.data.frlxfs),
+              txdz: decrypt_ECB(res.data.txdz),
+            }
             let data = decryptData_ECB(res.data, ["frxm", "frzjhm", "frlxfs", "txdz"], [1, 2, 3, 4]);
             this.searchXydm = data.tyshxydm
             this.form.jgId = data.id
@@ -473,8 +480,23 @@ export default {
       this.reset()
       const id = row.id || this.ids
       if (this.user.userData.userType != '00') {
-        getUserDjpdSq(id).then((response) => { 
-          this.form = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs","jglxdh","jgfzrlxdh","jgfzrxm","jglxrxm"], [1, 2,3,3,3,1,1]);
+        getUserDjpdSq(id).then((response) => {
+          this.decodeStr = {
+            frxm: decrypt_ECB(response.data.frxm),
+            frzjhm: decrypt_ECB(response.data.frzjhm),
+            frlxfs: decrypt_ECB(response.data.frlxfs),
+            txdz: decrypt_ECB(response.data.txdz),
+
+            jglxrxm: decrypt_ECB(response.data.frxm),
+            jglxdh: decrypt_ECB(response.data.frlxfs),
+
+            jgfzrxm: decrypt_ECB(response.data.frzjhm),
+            jgfzrlxdh: decrypt_ECB(response.data.frlxfs),
+
+            sqrxm: decrypt_ECB(response.data.frxm),
+            sqrlxdh: decrypt_ECB(response.data.frlxfs),
+          }
+          this.form = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz", "jglxrxm", "jglxdh", "jgfzrxm", "jgfzrlxdh", "sqrxm", "sqrlxdh"], [1, 2, 3, 4, 1, 3, 1, 3, 1, 3]);
           this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
           this.open = true
           this.title = '修改等级评定申请'
@@ -491,7 +513,8 @@ export default {
     handleXQ(row) {
       this.details = {};
       getDjpdSqConfig(row.id, 'djpdSq').then((response) => {
-        this.details = response.data;
+        this.details = decryptData_ECB(response.data, ["frxm", "frzjhm", "frlxfs", "txdz", "jglxrxm", "jglxdh", "jgfzrxm", "jgfzrlxdh", "sqrxm", "sqrlxdh"], [1, 2, 3, 4, 1, 3, 1, 3, 1, 3]);
+        this.details.xqList[0].djpdSq = decryptData_ECB(response.data.xqList[0].djpdSq, ["sqrxm", "sqrlxdh"], [1, 3]);
         this.details.xqList.unshift(
           {
             'jg': {
@@ -500,9 +523,9 @@ export default {
             'title': '等级机构基本信息'
           }
         )
+
         this.isXQ = true
       })
-      // this.handleUpdate(row,true)
     },
     /** 修改按钮操作 */
     handleUpdateStart(row) {
@@ -525,7 +548,24 @@ export default {
           }
           this.submitFormLoading = true
           if (this.form.id != null) {
-            updateDjpdSq({ ...this.form, ...param })
+            let subForm = {
+              ...this.form,
+              ...param,
+              frxm: this.decodeStr.frxm,
+              frzjhm: this.decodeStr.frzjhm,
+              frlxfs: this.decodeStr.frlxfs,
+              txdz: this.decodeStr.txdz,
+
+              jglxrxm: this.decodeStr.frxm,
+              jglxdh: this.decodeStr.frlxfs,
+
+              jgfzrxm: this.decodeStr.frzjhm,
+              jgfzrlxdh: this.decodeStr.frlxfs,
+
+              sqrxm:this.decodeStr.frxm,
+              sqrlxdh: this.decodeStr.frlxfs,
+            }
+            updateDjpdSq(subForm)
               .then((response) => {
                 this.$modal.msgSuccess('修改成功')
                 this.open = false
@@ -533,7 +573,24 @@ export default {
               })
               .finally(() => (this.submitFormLoading = false))
           } else {
-            addDjpdSq({ ...this.form, ...param })
+            let subForm = {
+              ...this.form,
+              ...param,
+              frxm: this.decodeStr.frxm,
+              frzjhm: this.decodeStr.frzjhm,
+              frlxfs: this.decodeStr.frlxfs,
+              txdz: this.decodeStr.txdz,
+
+              jglxrxm: this.decodeStr.frxm,
+              jglxdh: this.decodeStr.frlxfs,
+
+              // jgfzrxm: this.decodeStr.frxm,
+              jgfzrlxdh: this.decodeStr.frlxfs,
+
+              // sqrxm:this.decodeStr.frxm,
+              // sqrlxdh: this.decodeStr.frlxfs,
+            }
+            addDjpdSq(subForm)
               .then((response) => {
                 this.$modal.msgSuccess('新增成功')
                 this.open = false
@@ -556,7 +613,24 @@ export default {
           }
           this.submitFormLoading = true
           if (this.form.id != null) {
-            updateDjpdSq({ ...this.form, ...param })
+            let subForm = {
+              ...this.form,
+              ...param,
+              frxm: this.decodeStr.frxm,
+              frzjhm: this.decodeStr.frzjhm,
+              frlxfs: this.decodeStr.frlxfs,
+              txdz: this.decodeStr.txdz,
+
+              jglxrxm: this.decodeStr.frxm,
+              jglxdh: this.decodeStr.frlxfs,
+
+              jgfzrxm: this.decodeStr.frzjhm,
+              jgfzrlxdh: this.decodeStr.frlxfs,
+
+              sqrxm:this.decodeStr.frxm,
+              sqrlxdh: this.decodeStr.frlxfs,
+            }
+            updateDjpdSq(subForm)
               .then((response) => {
                 updateDjpdStart(response.data.id).then((res) => {
                   this.$modal.msgSuccess('该申请已提交')
@@ -568,7 +642,24 @@ export default {
               })
               .finally(() => (this.submitFormLoading = false))
           } else {
-            addDjpdSq({ ...this.form, ...param })
+            let subForm = {
+              ...this.form,
+              ...param,
+              frxm: this.decodeStr.frxm,
+              frzjhm: this.decodeStr.frzjhm,
+              frlxfs: this.decodeStr.frlxfs,
+              txdz: this.decodeStr.txdz,
+
+              jglxrxm: this.decodeStr.frxm,
+              jglxdh: this.decodeStr.frlxfs,
+
+              // jgfzrxm: this.decodeStr.frxm,
+              jgfzrlxdh: this.decodeStr.frlxfs,
+
+              // sqrxm:this.decodeStr.frxm,
+              // sqrlxdh: this.decodeStr.frlxfs,
+            }
+            addDjpdSq(subForm)
               .then((response) => {
                 updateDjpdStart(response.data.id).then((res) => {
                   this.$modal.msgSuccess('该申请已提交')