审批页面 合并企业资质

src/dashoo.cn/backend/api/controllers/oilsupplier/qualchange.go

@@ -269,7 +269,7 @@ func (this *QualChangeController) AuditFileList() {
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
+		where = where + " and a.SupplierTypeCode in ( '000', " + SupplierTypeCode + ")"
 	}
 	where = where + " and b.FileUrl != ''"
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where)

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

@@ -400,137 +400,25 @@
 
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="物资类">
-          <el-card class="box-card">
-            <el-form :model="formData">
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo1" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
-            <el-table :data="businessList1" border>
-              <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 label="企业资质">
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
             </div>
             <el-table :data="subfileList1" border>
-              <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
-                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
-                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
-                </template>
-              </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="Remark" label="描述" show-overflow-tooltip></el-table-column>
-            </el-table>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="基建类">
-          <el-card class="box-card">
-            <el-form :model="formData">
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo2" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
-            <el-table :data="businessList2" border>
-              <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 style="font-weight: bold">企业资质</span>
-            </div>
-            <el-table :data="subfileList2" border>
-              <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
-                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
-                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
+              <el-table-column label="操作" width="150" align="center" fixed>
                 <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>
+                  <el-button type="primary" plain size="mini" title="文件变更" @click="openDialog(scope.row)"
+                             :disabled="InfoStatus > 0 || butnab">
+                    变更</el-button>
                 </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="Remark" label="描述" show-overflow-tooltip></el-table-column>
-            </el-table>
-          </el-card>
-        </el-tab-pane>
-        <el-tab-pane label="技术服务类">
-          <el-card class="box-card">
-            <el-form :model="formData">
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo3" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-form>
-            <el-table :data="businessList3" border>
-              <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 style="font-weight: bold">企业资质</span>
-            </div>
-            <el-table :data="subfileList3" border>
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
                     <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
-                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                       class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
                   </div>
                 </template>
               </el-table-column>
@@ -543,17 +431,28 @@
                 <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>
+                       class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
+              <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="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
+
+            <el-pagination small
+                           @size-change="handleProjectSizeChange"
+                           @current-change="handleProjectCurrentChange"
+                           :current-page="currentPageProject"
+                           :page-sizes="[10, 20, 30]"
+                           :page-size="sizeProject"
+                           layout="total, sizes, prev, pager, next,jumper"
+                           :total="currentItemCountProject"
+                           style="margin: 5px;">
+            </el-pagination>
           </el-card>
         </el-tab-pane>
       </el-tabs>
@@ -672,6 +571,10 @@
     },
     data() {
       return {
+        sizeProject: 10,
+        currentItemCount: 0,
+        currentPageProject: 1,
+        currentItemCountProject: 0,
         chooseAuditorVisible: false,
         myitemsshow: false,
         auditstepcode: '',
@@ -970,11 +873,7 @@
       this.auditget()
       this.getDictOptions()
       this.getfilelist1()
-      this.getbusList1()
-      this.getfilelist2()
-      this.getbusList2()
-      this.getfilelist3()
-      this.getbusList3()
+
       this.getAccessCardNo()
     },
     methods: {
@@ -1263,16 +1162,16 @@
         let _this = this
         const params = {
           SupplierId: this.SuppId,
-          SupplierTypeCode: '01',
-          _currentPage: 1,
-          _size: 1000,
+          SupplierTypeCode: '\'01\',\'02\',\'03\'',
+          _currentPage: this.currentPageProject,
+          _size: this.sizeProject
         }
         _this.$axios.get('qualchange/auditfilelist', {
             params
           })
           .then(res => {
             _this.subfileList1 = res.data.items
-            _this.currentItemCount = res.data.currentItemCount
+            _this.currentItemCountProject = res.data.currentItemCount
             for (let idx in _this.subfileList1) {
               _this.subfileList1[idx].FileUrlList = _this.subfileList1[idx].FileUrl.split('$')
 
@@ -1610,6 +1509,16 @@
         countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
         this.countryoptions = JSON.parse(countstr)
       },
+
+      handleProjectSizeChange (value) {
+        this.sizeProject = value
+        this.currentPageProject = 1
+        this.getfilelist1()
+      },
+      handleProjectCurrentChange (value) {
+        this.currentPageProject = value
+        this.getfilelist1()
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -472,7 +472,7 @@
               </el-table-column>
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
-          
+
              <el-pagination small
                        @size-change="handleProjectSizeChange"
                        @current-change="handleProjectCurrentChange"
@@ -482,7 +482,7 @@
                        layout="total, sizes, prev, pager, next,jumper"
                        :total="currentItemCountProject"
                        style="margin: 5px;">
-        </el-pagination>  
+        </el-pagination>
           </el-card>
         </el-tab-pane>
 
@@ -603,7 +603,7 @@
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
             </el-table>
           </el-card>
-        </el-tab-pane> -->     
+        </el-tab-pane> -->
       </el-tabs>
     </el-card>
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">