Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -615,15 +615,17 @@
 
                   <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.OldFileUrl, index)" >
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
                   </viewer>
 
@@ -649,15 +651,17 @@
                       <el-col :span="20">
                         <viewer :images="scope.row.FileUrlList">
                         <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                        <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                          v-if="imgFormat(scope.row.FileUrl, index)" >
-                          {{scope.row.FileName.split('$')[index]}}</el-link>
-                        <img
-                          v-else
-                          class="photoStyle" alt=""
-                          v-if="fileurlcut(scope.row.FileUrl, index)"
-                          :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                          :key="index">
+                          <div v-if="imgFormat(scope.row.FileUrl, index)">
+                            <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                              {{scope.row.FileName.split('$')[index]}}</el-link>
+                          </div>
+                          <div v-else>
+                            <img
+                              class="photoStyle" alt=""
+                              v-if="fileurlcut(scope.row.FileUrl, index)"
+                              :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
+                              :key="index">
+                          </div>
                         </div>
                         </viewer>
                       </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -704,15 +704,17 @@
                   </div> -->
                    <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.OldFileUrl, index)" >
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
                     </viewer>
 
@@ -731,15 +733,17 @@
                     <el-col :span="20">
                       <viewer :images="scope.row.FileUrlList">
                       <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.FileUrl, index)" >
-                        {{scope.row.FileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
+                        <div v-if="imgFormat(scope.row.FileUrl, index)">
+                          <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                            {{scope.row.FileName.split('$')[index]}}</el-link>
+                        </div>
+                        <div v-else>
+                          <img
+                            class="photoStyle" alt=""
+                            v-if="fileurlcut(scope.row.FileUrl, index)"
+                            :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
+                            :key="index">
+                        </div>
                       </div>
                       </viewer>
                     </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -534,14 +534,17 @@
 
                   <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.OldFileUrl, index)" >
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
                   </viewer>
 
@@ -579,14 +582,17 @@
                       <el-col :span="20">
                         <viewer :images="scope.row.FileUrlList">
                         <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                        <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                          v-if="imgFormat(scope.row.FileUrl, index)" >
-                          {{scope.row.FileName.split('$')[index]}}</el-link>
-                        <img
-                          v-else
-                          class="photoStyle" alt=""
-                          :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                          :key="index">
+                          <div v-if="imgFormat(scope.row.FileUrl, index)">
+                            <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                              {{scope.row.FileName.split('$')[index]}}</el-link>
+                          </div>
+                          <div v-else>
+                            <img
+                              class="photoStyle" alt=""
+                              v-if="fileurlcut(scope.row.FileUrl, index)"
+                              :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
+                              :key="index">
+                          </div>
                         </div>
                         </viewer>
                       </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -527,15 +527,17 @@
 
                   <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.OldFileUrl, index)" >
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
                     </viewer>
 
@@ -565,15 +567,17 @@
 
                   <viewer :images="scope.row.FileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                      <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                        v-if="imgFormat(scope.row.FileUrl, index)" >
-                        {{scope.row.FileName.split('$')[index]}}</el-link>
-                      <img
-                        v-else
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
+                      <div v-if="imgFormat(scope.row.FileUrl, index)">
+                        <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.FileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
+                          :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
                     </viewer>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -480,6 +480,7 @@
                       <div v-else>
                         <img
                           class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
                           :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
                           :key="index">
                       </div>