准入范围

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

@@ -177,7 +177,7 @@ module.exports = {
     'pages/oilsupplier/suppliernopass/*.*',
     'pages/oilsupplier/supplierps/*.*',
     'pages/oilsupplier/supplierstorage/*.*',
-    // 'pages/oilsupplier/supplierstore/*.*',
+    'pages/oilsupplier/supplierstore/*.*',
     'pages/oilsupplier/tablefieldsetting/*.*',
     // 'pages/oilsupplier/technologyservice/*.*',
     'pages/system/*/*.*',

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

@@ -808,7 +808,6 @@ export default {
     }
     // 注册资金限制
     var checkMoney = (rule, value, callback) => {
-      console.log(value)
       if (value < 0) {
         callback(new Error('注册资金不能小于0'))
       } else {

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

@@ -42,8 +42,8 @@
         </el-table-column>
         <el-table-column label="是否为制造商" width="100">
           <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'|| !canadd || !newcanadd">非制造商</el-button>
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)" :disabled="operType != '制造商'|| !canadd || !newcanadd">制造商</el-button>
+            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)" :disabled="(operType != '制造商')&& !(canadd || newcanadd)">非制造商</el-button>
+            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)" :disabled="(operType != '制造商')&& !(canadd || newcanadd)">制造商</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="CertSubStatus"
@@ -351,10 +351,10 @@ export default {
     },
     type_change(val,canadd,newcanadd){
       if (canadd == true || newcanadd == true) {
-      if (val.row.IsManufacturer == 2){
-        this.tableloading = true
-        let IsManufacturer = 2
-        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) +'/'+parseInt(val.row.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
+        if (val.row.IsManufacturer == 2){
+          this.tableloading = true
+          let IsManufacturer = 2
+          this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) +'/'+parseInt(val.row.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -364,13 +364,13 @@ export default {
               this.tableloading = false
             }
           })
-          .catch(err => {
-            console.error(err)
-          })
+            .catch(err => {
+              console.error(err)
+            })
         }else if (val.row.IsManufacturer == 1){//---------------转换供应商与非供应商
-        this.tableloading = true
-        let IsManufacturer = 1
-        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) +'/'+parseInt(val.row.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
+          this.tableloading = true
+          let IsManufacturer = 1
+          this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) +'/'+parseInt(val.row.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
@@ -380,9 +380,9 @@ export default {
               this.tableloading = false
             }
           })
-          .catch(err => {
-            console.error(err)
-          })
+            .catch(err => {
+              console.error(err)
+            })
         }
       }
     },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -411,6 +411,7 @@
               <!--</el-cascader>-->
               <el-select v-model="selectDept"
                          filterable
+                         disabled
                          placeholder="请选择"
                          style="width: 100%"
                          @change="changeOrgUnit">
@@ -800,7 +801,6 @@ export default {
       this.formData.Id = 0
     }
     this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-    console.log('----this.IsCompanyUser----', this.IsCompanyUser)
     this.getDictOptions()
     // this.getorgtreelist()
     if (this.IsCompanyUser && this.serviceId === 'add') {
@@ -1489,7 +1489,6 @@ export default {
       })
     },
     selectAuditOrg () {
-      console.log('----this.IsCompanyUser', this.IsCompanyUser)
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {
@@ -1497,7 +1496,6 @@ export default {
       }
     },
     chooseAuditorShow () {
-      console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
       this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
       this.chooseAuditorVisible = true
     },
@@ -1508,7 +1506,6 @@ export default {
       this.auditOrgChang(this.auditer)
     },
     chooseAuditorShowFen () {
-      console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
       this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
       this.chooseAuditorVisibleFen = true
     },
@@ -1593,7 +1590,6 @@ export default {
       this.applyLoading = true
       this.auditform.FirstAuditName = this.UnitOrg
       this.auditform.CertId = this.certId
-      console.log('--this.audiform--', this.auditform)
       apiCert
         .auditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -417,6 +417,7 @@
               <!--</el-cascader>-->
               <el-select v-model="selectDept"
                          filterable
+                         disabled
                          placeholder="请选择"
                          style="width: 100%"
                          @change="changeOrgUnit">