战略合作准入资质提醒;增项服务基建顺序

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

@@ -414,59 +414,6 @@
               </el-form>
             </el-card>
             <!-- 增项分类列表 -->
-            <el-row :gutter="2">
-              <el-col :span="12">
-                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
-                  <div slot="header">
-                    <span><i class="icon icon-table2"></i> 全部准入范围</span>
-                    <!-- <el-button style="float: right; padding: 3px 0" type="text"
-                      v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button> -->
-                  </div>
-                  <el-table :data="entityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
-                    <!-- <el-table-column label="操作" min-width="100" align="center" fixed>
-                      <template slot-scope="scope">
-                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                          :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
-                      </template>
-                    </el-table-column> -->
-                    <!-- <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-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-                layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-              </el-pagination> -->
-                </el-card>
-              </el-col>
-              <el-col :span="12">
-                <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
-                :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
-                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
-                  <div slot="header">
-                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
-                    <el-button style="float: right; padding: 3px 0" type="text"
-                               v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
-                  </div>
-                  <el-table :data="myentityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
-                    <el-table-column label="操作" min-width="100" align="center" fixed>
-                      <template slot-scope="scope">
-                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                                   :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
-                      </template>
-                    </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-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-                layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-              </el-pagination> -->
-                </el-card>
-              </el-col>
-            </el-row>
             <el-card class="box-card" style="margin-top: 10px;">
               <div slot="header" class="clearfix">
                 <span><i class="icon icon-table2"></i> 企业资质</span>
@@ -487,16 +434,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>
 
 
@@ -534,19 +481,19 @@
                     <el-row align="middle">
                       <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>
+                          <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>
                       </el-col>
-                     <el-col :span="4" v-if="scope.row.FileUrl != '' && formData.Status <= 0 && formData.Status != -5">
+                      <el-col :span="4" v-if="scope.row.FileUrl != '' && formData.Status <= 0 && formData.Status != -5">
                         <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
                       </el-col>
                     </el-row>
@@ -570,6 +517,59 @@
                 </el-button>
               </div>
             </el-card>
+            <el-row :gutter="2">
+              <el-col :span="12">
+                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
+                  <div slot="header">
+                    <span><i class="icon icon-table2"></i> 全部准入范围</span>
+                    <!-- <el-button style="float: right; padding: 3px 0" type="text"
+                      v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button> -->
+                  </div>
+                  <el-table :data="entityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
+                    <!-- <el-table-column label="操作" min-width="100" align="center" fixed>
+                      <template slot-scope="scope">
+                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
+                          :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
+                      </template>
+                    </el-table-column> -->
+                    <!-- <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-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+                layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+              </el-pagination> -->
+                </el-card>
+              </el-col>
+              <el-col :span="12">
+                <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
+                :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
+                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
+                  <div slot="header">
+                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
+                    <el-button style="float: right; padding: 3px 0" type="text"
+                               v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
+                  </div>
+                  <el-table :data="myentityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @sort-change="orderby">
+                    <el-table-column label="操作" min-width="100" align="center" fixed>
+                      <template slot-scope="scope">
+                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
+                                   :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
+                      </template>
+                    </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-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+                layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+              </el-pagination> -->
+                </el-card>
+              </el-col>
+            </el-row>
           </el-tab-pane>
         </el-tabs>
       </div>

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

@@ -423,41 +423,6 @@
                 </el-row>
               </el-form>
             </el-card>
-            <!-- 增项分类列表 -->
-            <el-row :gutter="2">
-              <el-col :span="12">
-                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
-                  <div slot="header">
-                    <span><i class="icon icon-table2"></i> 全部准入范围</span>
-                  </div>
-                  <el-table :data="entityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @sort-change="orderby">
-                    <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-col>
-              <el-col :span="12">
-                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
-                  <div slot="header">
-                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
-                    <el-button style="float: right; padding: 3px 0" type="text"
-                               v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
-                  </div>
-                  <el-table :data="myentityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @sort-change="orderby">
-                    <el-table-column label="操作" min-width="100" align="center" fixed>
-                      <template slot-scope="scope">
-                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                                   :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
-                      </template>
-                    </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-col>
-            </el-row>
             <el-card class="box-card" style="margin-top: 10px;">
               <div slot="header" class="clearfix">
                 <span><i class="icon icon-table2"></i> 企业资质</span>
@@ -478,16 +443,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>
 
 
@@ -511,19 +476,19 @@
                     <el-row align="middle">
                       <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>
+                          <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>
                       </el-col>
-                     <el-col :span="4" v-if="scope.row.FileUrl != '' && formData.Status <= 0 && formData.Status != -5">
+                      <el-col :span="4" v-if="scope.row.FileUrl != '' && formData.Status <= 0 && formData.Status != -5">
                         <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
                       </el-col>
                     </el-row>
@@ -561,6 +526,41 @@
                 </el-button>
               </div>
             </el-card>
+            <!-- 增项分类列表 -->
+            <el-row :gutter="2">
+              <el-col :span="12">
+                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
+                  <div slot="header">
+                    <span><i class="icon icon-table2"></i> 全部准入范围</span>
+                  </div>
+                  <el-table :data="entityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @sort-change="orderby">
+                    <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-col>
+              <el-col :span="12">
+                <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
+                  <div slot="header">
+                    <span><i class="icon icon-table2"></i> 新增准入范围</span>
+                    <el-button style="float: right; padding: 3px 0" type="text"
+                               v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
+                  </div>
+                  <el-table :data="myentityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @sort-change="orderby">
+                    <el-table-column label="操作" min-width="100" align="center" fixed>
+                      <template slot-scope="scope">
+                        <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
+                                   :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
+                      </template>
+                    </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-col>
+            </el-row>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -1919,6 +1919,14 @@
       },
       // 保存信息变更数据
       saveinfochange () {
+        console.log(this.subfileList1, '增项')
+        console.log(this.formData.InStyle, '增项')
+        if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
+          this.$message({
+            type: 'warning',
+            message: '战略合作准入企业资质不能为空！'
+          })
+        }
         this.$refs['supplierData'].validate((valid) => {
           if (valid) {
             let AllInfochangeItemList = {