搜索框

src/mixins/JeecgListMixin.js

@@ -95,9 +95,12 @@ export const JeecgListMixin = {
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-          this.dataSource = res.result.records||res.result;
-          if(res.result.total)
-          {
+          if (!res.result){
+            this.dataSource = []
+          }else {
+            this.dataSource = res.result.records|| res.result;
+          }
+          if(res.result && res.result.total) {
             this.ipagination.total = res.result.total;
           }else{
             this.ipagination.total = 0;

src/views/customer/CustomerHistorys.vue

@@ -48,36 +48,36 @@
         </div>
       </a-card>
 
-      <!--   操作日志   -->
-      <a-card :bordered="false" title="操作日志" style="margin-top: 10px;">
+<!--      &lt;!&ndash;   操作日志   &ndash;&gt;-->
+<!--      <a-card :bordered="false" title="操作日志1" style="margin-top: 10px;">-->
 
-        <div>
-          <a-table
-            ref="table"
-            size="middle"
-            :scroll="{x:true}"
-            bordered
-            rowKey="id"
-            :columns="columnsLog"
-            :dataSource="dataSourceLog"
-            :pagination="ipaginationLog"
-            class="j-table-force-nowrap"
-            @change="handleTableChange">
+<!--        <div>-->
+<!--          <a-table-->
+<!--            ref="table"-->
+<!--            size="middle"-->
+<!--            :scroll="{x:true}"-->
+<!--            bordered-->
+<!--            rowKey="id"-->
+<!--            :columns="columnsLog"-->
+<!--            :dataSource="dataSourceLog"-->
+<!--            :pagination="ipaginationLog"-->
+<!--            class="j-table-force-nowrap"-->
+<!--            @change="handleTableChange">-->
 
-             <span slot="action" slot-scope="text, record">
-               <a @click="showByCardNo(record)">查看</a>
-             </span>
-            <template v-slot:numberResults="text, record">
-              <a-badge :status="text | statusTypeFilter" :text="text | statusFilter"/>
-            </template>
+<!--             <span slot="action" slot-scope="text, record">-->
+<!--               <a @click="showByCardNo(record)">查看</a>-->
+<!--             </span>-->
+<!--            <template v-slot:numberResults="text, record">-->
+<!--              <a-badge :status="text | statusTypeFilter" :text="text | statusFilter"/>-->
+<!--            </template>-->
 
-            <template v-slot:status="text, record">
-              <a-badge :color="record | statusEscalationColor"  :text="record | escalationFilter"/>
-            </template>
+<!--            <template v-slot:status="text, record">-->
+<!--              <a-badge :color="record | statusEscalationColor"  :text="record | escalationFilter"/>-->
+<!--            </template>-->
 
-          </a-table>
-        </div>
-      </a-card>
+<!--          </a-table>-->
+<!--        </div>-->
+<!--      </a-card>-->
     </a-page-header>
 
   </div>

src/views/smscheck/modules/TaskUploadDataSelect.vue

@@ -125,8 +125,7 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-button  style="display: block;position: relative;left:auto;margin-top: 10px;border-color: #1890FF;color: #1890FF" @click="historys">修改历史
-      </a-button>
+
       <div>
         <a-modal v-model:open="open" title="修改历史"   @ok="handleOk"  :width="700">
           <template slot="footer" >
@@ -139,33 +138,44 @@
           </a-table>
         </a-modal>
       </div>
-      <hr>
-      <div style="width: 100%;float:left;margin-left: 20%">
-        <a-list size="large"  >
-          <template>
-            <a-list-item style='height: 60px' >
-              <a-col :span="6" >
-                <div>
-                  <div style="float:left;margin: 50px 3px;" id="directRequirements">稽核是否通过</div>
-                  <div style="float:left;margin: 50px 10px;" >
-                    <a-radio-group  button-style="solid"  disabled v-model='infoModel.infoResult'>
-                      <a-radio :value="'1'">是</a-radio>
-                      <a-radio :value="'2'">否</a-radio>
-                    </a-radio-group>
-                  </div>
-                </div>
-              </a-col>
-              <a-col :span="18" >
-                <div style="clear: both"></div>
-                <a-form-model-item label="稽核结果备注"   prop="basicCheckNote" style="float:left;margin: 50px 10px;" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" >
-                  <a-textarea disabled v-model=infoModel.infoResultRemark  placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:60px; width: 500px;"   />
-                </a-form-model-item>
-
-              </a-col>
-            </a-list-item>
-          </template>
-        </a-list>
+      <div  >
+        <a-form-model-item label="稽核状态" prop="basicCheckState" v-bind="labelCol1">
+          <a-tag class="font-size-14" v-if="infoModel.infoResult == '2'" color="#f50">未通过</a-tag>
+          <a-tag class="font-size-14" v-if="infoModel.infoResult =='1'" color="#2db7f5">通过</a-tag>
+        </a-form-model-item>
+        <a-form-model-item label="稽核结果" prop="basicCheckNote" v-bind="labelCol1">
+          <a-tag class="font-size-14" color="orange">{{ infoModel.infoResultRemark }}</a-tag>
+        </a-form-model-item>
       </div>
+      <a-button  style="display: block;position: relative;left:auto;margin-top: 10px;border-color: #1890FF;color: #1890FF" @click="historys">修改历史
+      </a-button>
+<!--      <hr>-->
+<!--      <div style="width: 100%;float:left;margin-left: 20%">-->
+<!--        <a-list size="large"  >-->
+<!--          <template>-->
+<!--            <a-list-item style='height: 60px' >-->
+<!--              <a-col :span="6" >-->
+<!--                <div>-->
+<!--                  <div style="float:left;margin: 50px 3px;" id="directRequirements">稽核是否通过</div>-->
+<!--                  <div style="float:left;margin: 50px 10px;" >-->
+<!--                    <a-radio-group  button-style="solid"  disabled v-model='infoModel.infoResult'>-->
+<!--                      <a-radio :value="'1'">是</a-radio>-->
+<!--                      <a-radio :value="'2'">否</a-radio>-->
+<!--                    </a-radio-group>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </a-col>-->
+<!--              <a-col :span="18" >-->
+<!--                <div style="clear: both"></div>-->
+<!--                <a-form-model-item label="稽核结果备注"   prop="basicCheckNote" style="float:left;margin: 50px 10px;" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }" >-->
+<!--                  <a-textarea disabled v-model=infoModel.infoResultRemark  placeholder="请输入上述信息的稽核结果" style="float:left;margin: 3px 3px;height:60px; width: 500px;"   />-->
+<!--                </a-form-model-item>-->
+
+<!--              </a-col>-->
+<!--            </a-list-item>-->
+<!--          </template>-->
+<!--        </a-list>-->
+<!--      </div>-->
 
     </a-page-header>
 
@@ -219,24 +229,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.contractDateResult ==='2'"
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'contractDate')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -343,24 +353,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.businessLicenseDateResult ==='2'"
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'businessLicenseDate')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
 
             </swiper-slide>
             <!--            <div
@@ -468,25 +478,25 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.codeNumberDateResult ==='2'"
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'codeNumberDate')">移除
               </a-button>
 
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
 
             </swiper-slide>
             <!--            <div
@@ -594,24 +604,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.filingsDateResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'filingsDate')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -718,24 +728,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.permitDateResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'permitDate')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -842,24 +852,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.corporationCardResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'corporationCard')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -967,24 +977,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.personResponsibleResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'personResponsible')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1091,24 +1101,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.operatorCardResult ==='2' "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'operatorCard')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1215,24 +1225,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.operatorCardPhoneResult ==='2' "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'operatorCardPhone')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1340,24 +1350,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.devicePhoneResult ==='2' "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'devicePhone')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1465,24 +1475,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.textMessageResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'textMessage')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1589,24 +1599,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.textMessageBookResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'textMessageBook')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1714,24 +1724,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.secureBookResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'secureBook')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1838,24 +1848,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.specialResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'special')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -1962,24 +1972,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.networkAccessResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'networkAccess')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -2086,24 +2096,24 @@
                 frameborder="1"
                 :src="item.urlBase"
                 ref="ifr"
-                width="100%"
+                width="85%"
                 height="445px"
                 scrolling="auto">
               </iframe>
-              <img style="width: 70%;height: 70%;border: 1px solid;"
+               <div><img style="width: 85%;height: 445px;border: 1px solid;"
                    v-if="!item.urlBase" :src="noDataPng" border="1">
               <a-button v-if="infoModel.groupPriceApprovalResult ==='2'  "
                         style="display: block;margin-top: 10px;border-color: red;color: red"
                         danger @click="removeFile(item,'groupPriceApproval')">移除
               </a-button>
-              <a-button  style="float:left;display: block;position: relative;margin-top: 10px;border-color: #1890FF;color: #1890FF"
+              <a-button  style="float:left;display: block;position: relative;margin-top: 1px;border-color: #1890FF;color: #1890FF"
                          v-if="  item.urlBase "
                          @click="downloadFile(item.url)">下载
               </a-button>
               <a-button  style="display: block;position: relative;left:20px;margin-top: 10px;border-color: #1890FF;color: #1890FF"
                          v-if=" item.urlBase "
                          @click="jumpUrl(item.urlBase)">预览
-              </a-button>
+              </a-button></div>
             </swiper-slide>
             <!--            <div
                           class="swiper-button-next swiper-button-white"
@@ -3153,9 +3163,9 @@ export default {
 }
 
 .thumb-example {
-  width: 864px;
+  width: 921px;
   margin-top: 20px;
-  // background: #000;
+  left: 6%;
 }
 
 .swiper-slide {
@@ -3175,7 +3185,7 @@ export default {
   height: 20% !important;
   box-sizing: border-box;
   padding: 10px 0px;
-  /*  width: 864px;*/
+  width: 948px;
   margin-left: 2px;
 
   .swiper-button-next {

src/views/system/UserList.vue

@@ -17,7 +17,19 @@
               <j-input placeholder="输入用户姓名模糊查询" v-model="queryParam.realname"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="归属部门">
+              <j-input placeholder="输入归属部门模糊查询" v-model="queryParam.departName"></j-input>
+            </a-form-item>
+          </a-col>
 
+          <a-form-model-item label="角色分配"  :md="6" :sm="12">
+            <j-multi-select-tag
+              v-model="queryParam.selectedroles"
+              :options="rolesOptions"
+              placeholder="请选择角色">
+            </j-multi-select-tag>
+          </a-form-model-item>
           <!--          <a-col :md="6" :sm="8">-->
           <!--            <a-form-item label="性别">-->
           <!--              <a-select v-model="queryParam.sex" placeholder="请选择性别">-->
@@ -187,7 +199,8 @@
 import UserModal from './modules/UserModal'
 import PasswordModal from './modules/PasswordModal'
 import {putAction,getFileAccessHttpUrl} from '@/api/manage';
-import {frozenBatch} from '@/api/api'
+import { addUser,editUser,queryall } from '@/api/api'
+import { frozenBatch, queryUserRole } from '@/api/api'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import SysUserAgentModal from "./modules/SysUserAgentModal";
 import JInput from '@/components/jeecg/JInput'
@@ -221,6 +234,7 @@ export default {
       description: '这是用户管理页面',
       queryParam: {},
       recycleBinVisible: false,
+      rolesOptions:[],
       columns: [
         {
           title: '#',
@@ -323,6 +337,9 @@ export default {
       },
     }
   },
+  created() {
+    this.initRoleList();
+  },
   computed: {
     importExcelUrl: function(){
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
@@ -415,6 +432,19 @@ export default {
         this.loadData()
       }
     },
+
+    //初始化角色字典
+    initRoleList(){
+      queryall().then((res)=>{
+        if(res.success){
+          this.rolesOptions = res.result.map((item,index,arr)=>{
+            let c = {label:item.roleName, value:item.id}
+            return c;
+          })
+          console.log('this.rolesOptions: ',this.rolesOptions)
+        }
+      });
+    },
   }
 
 }