Explorar o código

修改增项中的bug

Liuqi %!s(int64=6) %!d(string=hai) anos
pai
achega
a0f6fad68f

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -73,7 +73,7 @@ func (this *SelectController) GetTList() {
 
 	// //获取分页信息
 	page := this.GetPageInfoForm()
-	where := " 1=1 "
+	where := " 1=1 AND b.InFlag in (1,2,3) AND b.Status = '8' "
 	orderby := "a.Id"
 	asc := true
 	Order := this.GetString("Order")

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -1463,6 +1463,7 @@
         _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
         _this.addSortAppend()
         _this.switchstatus = false
+        this.dialogloading = false
       },
 
       getsectreelist () {

+ 4 - 0
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -66,6 +66,7 @@
         id="rebateSetTable"
         :data="entityList"
         size="mini"
+        v-loading="loading"
         border
         height="calc(100vh - 243px)"
         style="width: 100%"
@@ -776,6 +777,7 @@ export default {
       SupplierName: '',
       dialogVisibleCertsSub: false,
       dialogVisibleSubFile: false,
+      loading: false,
       HSEOptions: [
         {
           value: '',
@@ -1103,6 +1105,7 @@ export default {
         this.currentPage = 1
         this.dialogVisible = false
       }
+      this.loading = true
       let myCreateOn = []
       // 解析时间
       if (this.CreateOn != null && this.CreateOn.length === 2) {
@@ -1125,6 +1128,7 @@ export default {
         .then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
+          this.loading = false
         })
         .catch(err => {
           console.error(err)