级别隐藏

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

@@ -398,7 +398,7 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 			}
 
 			var list []supplierfile.OilSupplierFile
-			where := "SupplierTypeCode in (01,000) and IsManuf in ('0','2') and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
+			where := "SupplierTypeCode in (01,000) and IsManuf in ('0','2', '') and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
 			svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
 
 			//三证合一或五证合一不需要的字段

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,13 +161,13 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    'pages/oilsupplier/annualaudit/*.*',
+    // 'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
     // 'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
     // 'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
-    'pages/oilsupplier/infochangech/*.*',
+    // 'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',
     // 'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
@@ -175,7 +175,7 @@ module.exports = {
     'pages/oilsupplier/supplierfile/*.*',
 
     'pages/oilsupplier/suppliernopass/*.*',
-    'pages/oilsupplier/supplierps/*.*',
+    // 'pages/oilsupplier/supplierps/*.*',
     'pages/oilsupplier/supplierstorage/*.*',
     // 'pages/oilsupplier/supplierstore/*.*',
     'pages/oilsupplier/tablefieldsetting/*.*',

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

@@ -507,18 +507,14 @@
           }
         }
       }
-      //注册资金限制
+      // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'));
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-            if (value < 1) {
-              callback(new Error('注册资金至少为1'));
-            } else {
-              callback();
-            }
-          }
-        };
+          callback()
+        }
+      }
       // 传真检验
       var checkFax = (rule, value, callback) => {
         if (!value) {
@@ -622,11 +618,10 @@
             trigger: 'change'
           } ],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',

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

@@ -413,6 +413,14 @@
       }
     },
     data () {
+      // 注册资金限制
+      var checkMoney = (rule, value, callback) => {
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
+        } else {
+          callback()
+        }
+      }
       var checkemail = (rule, value, callback) => {
         if (value) {
           let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
@@ -489,18 +497,18 @@
           }
         }
       }
-      //注册资金限制
-      var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'));
-        } else {
-            if (value < 1) {
-              callback(new Error('注册资金至少为1'));
-            } else {
-              callback();
-            }
-          }
-        };
+      // //注册资金限制
+      // var checkMoney = (rule, value, callback) => {
+      //   if (!value) {
+      //     return callback(new Error('注册资金不能为空'));
+      //   } else {
+      //       if (value < 1) {
+      //         callback(new Error('注册资金至少为1'));
+      //       } else {
+      //         callback();
+      //       }
+      //     }
+      //   };
 
       // 传真检验
       var checkFax = (rule, value, callback) => {
@@ -604,11 +612,15 @@
             trigger: 'change'
           } ],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          // RegCapital: [{
+          //   required: true,
+          //   validator: checkMoney,
+          //   trigger: 'change'
+          // } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -118,21 +118,21 @@
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8">
-                    <el-form-item label="级别">
-                      <el-select v-model="formData.Grade" :class="changedForm['Grade'] ? 'modified-form-input' : ''"
-                                 placeholder="请选择级别"
-                                 style="width: 100%"
-                                 @change="GradeChange">
-                        <el-option
-                          v-for="item in GradeOptions"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
+                  <!--<el-col :span="8">-->
+                    <!--<el-form-item label="级别">-->
+                      <!--<el-select v-model="formData.Grade" :class="changedForm['Grade'] ? 'modified-form-input' : ''"-->
+                                 <!--placeholder="请选择级别"-->
+                                 <!--style="width: 100%"-->
+                                 <!--@change="GradeChange">-->
+                        <!--<el-option-->
+                          <!--v-for="item in GradeOptions"-->
+                          <!--:key="item.value"-->
+                          <!--:label="item.label"-->
+                          <!--:value="item.value">-->
+                        <!--</el-option>-->
+                      <!--</el-select>-->
+                    <!--</el-form-item>-->
+                  <!--</el-col>-->
 
                   <el-col :span="8">
                     <el-form-item label="管理单位">
@@ -928,16 +928,24 @@
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
+      // // 注册资金限制
+      // var checkMoney = (rule, value, callback) => {
+      //   if (!value) {
+      //     return callback(new Error('注册资金不能为空'))
+      //   } else {
+      //     if (value < 1) {
+      //       callback(new Error('注册资金至少为1'))
+      //     } else {
+      //       callback()
+      //     }
+      //   }
+      // }
 
       // 固话检验
       var checkTelphone = (rule, value, callback) => {
@@ -1287,11 +1295,15 @@
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          // RegCapital: [{
+          //   required: true,
+          //   validator: checkMoney,
+          //   trigger: 'change'
+          // } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',

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

@@ -86,23 +86,23 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
-                <el-form-item label="级别">
-                  <el-select v-model="formData.Grade"
-                             placeholder="请选择级别"
-                             :disabled="this.formData.Status > '0'&&!appendStatus"
-                             :class="changedForm['Grade'] ? 'modified-form-input' : ''"
-                             style="width: 100%"
-                             @change="GradeChange">
-                    <el-option
-                      v-for="item in GradeOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+              <!--<el-col :span="8">-->
+                <!--<el-form-item label="级别">-->
+                  <!--<el-select v-model="formData.Grade"-->
+                             <!--placeholder="请选择级别"-->
+                             <!--disabled-->
+                             <!--:class="changedForm['Grade'] ? 'modified-form-input' : ''"-->
+                             <!--style="width: 100%"-->
+                             <!--@change="GradeChange">-->
+                    <!--<el-option-->
+                      <!--v-for="item in GradeOptions"-->
+                      <!--:key="item.value"-->
+                      <!--:label="item.label"-->
+                      <!--:value="item.value">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+              <!--</el-col>-->
 
               <el-col :span="8">
                 <el-form-item label="管理单位">