缺少资质文件逗号;企业资质和范围换顺序

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -562,7 +562,11 @@
             _this.lostTableData = res.data || []
             _this.lostTableDataInfo = ''
             for (let i = 0; i < _this.lostTableData.length; i++) {
-              _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ', '
+              if (i + 1 == _this.lostTableData.length) {
+                _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ''
+              } else {
+                _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ', '
+              }
             }
             _this.ClassId = val.Id
             _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -407,34 +407,26 @@
               </el-form>
             </el-card>
             <!-- 增项分类列表 -->
-            <el-card class="box-card" style="margin-top: 10px;">
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-              </el-table>
-            </el-card>
             <el-card class="box-card" style="margin-top: 10px;">
               <div slot="header" class="clearfix">
                 <span><i class="icon icon-table2"></i> 企业资质</span>
               </div>
               <!--<el-table :data="subfileList" size="mini" border>-->
-                <!--<el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>-->
-                <!--<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>-->
-                  <!--<template slot-scope="scope">-->
-                    <!--<div v-for="(tmpUrl, index) in scope.row.FileUrlList">-->
-                      <!--<a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"-->
-                         <!--class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>-->
-                    <!--</div>-->
-                  <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>-->
-                  <!--<template slot-scope="scope">-->
-                    <!--{{ jstimehandle(scope.row.EffectDate+'') }}-->
-                  <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>-->
+              <!--<template slot-scope="scope">-->
+              <!--<div v-for="(tmpUrl, index) in scope.row.FileUrlList">-->
+              <!--<a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"-->
+              <!--class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>-->
+              <!--</div>-->
+              <!--</template>-->
+              <!--</el-table-column>-->
+              <!--<el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>-->
+              <!--<template slot-scope="scope">-->
+              <!--{{ jstimehandle(scope.row.EffectDate+'') }}-->
+              <!--</template>-->
+              <!--</el-table-column>-->
+              <!--<el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>-->
               <!--</el-table>-->
               <el-table :data="subfileList1" border>
                 <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
@@ -443,16 +435,16 @@
 
 
                     <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>
+                      <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>
                     </viewer>
 
                     <!-- <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
@@ -470,17 +462,17 @@
                   <template slot-scope="scope">
 
 
-                  <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>
+                    <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>
                     </viewer>
 
 
@@ -507,6 +499,14 @@
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
+            <el-card class="box-card" style="margin-top: 10px;">
+              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
+              </el-table>
+            </el-card>
           </el-tab-pane>
         </el-tabs>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -475,46 +475,26 @@
               </el-form>
             </el-card>
             <!-- 增项分类列表 -->
-            <el-card class="box-card" style="margin-top: 10px;">
-              <div slot="header">
-                <span><i class="icon icon-table2"></i> 准入范围</span>
-              </div>
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-                <el-table-column
-                  label="是否为制造商" width="100">
-                  <template slot-scope="scope">
-                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
-                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
-                    <span v-else>——</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-              </el-table>
-            </el-card>
-
             <el-card class="box-card" style="margin-top: 10px;">
               <div slot="header" class="clearfix">
                 <span><i class="icon icon-table2"></i> 企业资质</span>
               </div>
               <!--<el-table :data="subfileList" border>-->
-                <!--<el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>-->
-                <!--<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>-->
-                  <!--<template slot-scope="scope">-->
-                    <!--<div v-for="(tmpUrl, index) in scope.row.FileUrlList">-->
-                      <!--<a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"-->
-                         <!--class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>-->
-                    <!--</div>-->
-                  <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>-->
-                  <!--<template slot-scope="scope">-->
-                    <!--{{ jstimehandle(scope.row.EffectDate+'') }}-->
-                  <!--</template>-->
-                <!--</el-table-column>-->
-                <!--<el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>-->
+              <!--<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>-->
+              <!--<template slot-scope="scope">-->
+              <!--<div v-for="(tmpUrl, index) in scope.row.FileUrlList">-->
+              <!--<a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"-->
+              <!--class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>-->
+              <!--</div>-->
+              <!--</template>-->
+              <!--</el-table-column>-->
+              <!--<el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>-->
+              <!--<template slot-scope="scope">-->
+              <!--{{ jstimehandle(scope.row.EffectDate+'') }}-->
+              <!--</template>-->
+              <!--</el-table-column>-->
+              <!--<el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>-->
               <!--</el-table>-->
               <el-table :data="subfileList1" border>
                 <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
@@ -522,16 +502,16 @@
                   <template slot-scope="scope">
 
                     <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>
+                      <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>
                     </viewer>
 
                     <!-- <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
@@ -552,17 +532,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=""
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
-                    </div>
+                    <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>
                     </viewer>
 
 
@@ -588,6 +568,25 @@
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
+            <el-card class="box-card" style="margin-top: 10px;">
+              <div slot="header">
+                <span><i class="icon icon-table2"></i> 准入范围</span>
+              </div>
+              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+                <el-table-column
+                  label="是否为制造商" width="100">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                    <span v-else>——</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
+              </el-table>
+            </el-card>
           </el-tab-pane>
         </el-tabs>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -408,15 +408,6 @@
               </el-form>
             </el-card>
             <!-- 增项分类列表 -->
-            <el-card class="box-card" style="margin-top: 10px;">
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-              </el-table>
-            </el-card>
-
             <el-card class="box-card" style="margin-top: 10px;">
               <div slot="header" class="clearfix">
                 <span><i class="icon icon-table2"></i> 企业资质</span>
@@ -427,16 +418,16 @@
                   <template slot-scope="scope">
 
                     <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>
+                      <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>
                     </viewer>
 
 
@@ -468,17 +459,17 @@
                       </el-col>
                     </el-row> -->
 
-                  <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>
+                    <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>
                     </viewer>
 
 
@@ -492,6 +483,14 @@
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
+            <el-card class="box-card" style="margin-top: 10px;">
+              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+                <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
+              </el-table>
+            </el-card>
           </el-tab-pane>
         </el-tabs>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -2385,8 +2385,14 @@
           .then(res => {
             _this.lostTableData = res.data || []
             _this.lostTableDataInfo = ''
+            console.log(_this.lostTableData.length, 'length')
             for (let i=0; i<_this.lostTableData.length; i++) {
-              _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ', '
+              console.log(i + 1)
+              if (i + 1 == _this.lostTableData.length) {
+                _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ''
+              } else {
+                _this.lostTableDataInfo += _this.lostTableData[i].CertFileName + ', '
+              }
             }
             _this.ClassId = val.Id
             _this.dialogFormData.SupplierId = parseInt(_this.formData.SupplierId)