状态

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -13,6 +13,15 @@
         <el-table-column type="selection"  width="55"></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="CertSubStatus" label="状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+            <span v-if="scope.row.CertSubStatus=='1'"
+                  style="color:#67C23A">正常</span>
+            <span v-else-if="scope.row.CertSubStatus>'1'"
+                  style="color:#E6A23C">暂停</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" width="90" align="center" fixed>
@@ -189,6 +198,7 @@
           SupplierCertId: '',
           SupplierTypeCode: '',
           SubClassId: '',
+          CertSubStatus: '1',
           Code: '',
           Name: '',
           Remark: '',

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

@@ -16,6 +16,15 @@
 
         <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="CertSubStatus" label="状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+            <span v-if="scope.row.CertSubStatus=='1'"
+                  style="color:#67C23A">正常</span>
+            <span v-else-if="scope.row.CertSubStatus>'1'"
+                  style="color:#E6A23C">暂停</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" width="90" align="center" fixed >
@@ -200,6 +209,7 @@
           SupplierCertId: parseInt(_this.SupplierCertId),
           SupplierTypeCode: '01',
           Type: '1',
+          CertSubStatus: '1',
           Remark: _this.Remark
         }
         if (_this.checkList.length > 0) {

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

@@ -12,12 +12,16 @@
           提交
         </el-button> -->
       </div>
-      <el-table :data="businessList" border bordertooltip-effect="dark"  @selection-change="handleSelectionChange"> 
+      <el-table :data="businessList" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange"> 
         <el-table-column type="selection" width="55"></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, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItem_Count">
+      </el-pagination>
     </el-card>
 
     <el-card class="box-card" style="margin-top: 10px;">
@@ -158,6 +162,9 @@
     },
     data () {
       return {
+        size: 10,
+        currentPage: 1,
+        currentItem_Count: 0,
         yasuoname: '',
         SupplierId: 0,
         SupplierTypeCode: '',
@@ -269,14 +276,15 @@
         const params = {
           SupplierCertId: this.SupplierCertId,
           SupplierTypeCode: this.SupplierTypeCode,
-          _currentPage: 1,
-          _size: 1000
+          _currentPage: this.currentPage,
+          _size: this.size
         }
         this.$axios.get('suppliercertsub/list', {
           params
         })
           .then(res => {
             _this.businessList = res.data.items
+            _this.currentItem_Count = res.data.currentItemCount
           })
           .catch(err => {
             console.error(err)
@@ -600,6 +608,15 @@
           val = val.replace('T', ' ')
           return val.substring(0, 10)
         }
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.getbusList()
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.getbusList()
       }
     }
   }

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

@@ -18,6 +18,15 @@
 
         <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="CertSubStatus" label="状态" show-overflow-tooltip>
+            <template slot-scope="scope">
+            <span v-if="scope.row.CertSubStatus=='1'"
+                  style="color:#67C23A">正常</span>
+            <span v-else-if="scope.row.CertSubStatus>'1'"
+                  style="color:#E6A23C">暂停</span>
+            <span v-else>——</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" width="90" align="center" fixed>
@@ -169,6 +178,7 @@
           SupplierCertId: parseInt(_this.SupplierCertId),
           SupplierTypeCode: '03',
           Type: '1',
+          CertSubStatus: '1',
           Remark: _this.Remark
         }
         if (_this.checkList.length > 0) {