所代理制造商名称控制

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

@@ -697,14 +697,14 @@
         <el-button style="float: right; padding: 3px 10px"
                    type="text"
                    @click="manufacturerdialog"
-                   v-if="formDataCert.Status <= 0"
+                   v-if="formData.Status <= '0'"
                    :disabled="!certId"
         >添加</el-button>
       </div>
       <manufacturer-list ref="manufacturerList"
                          :data.sync="manufacturerList"
                          :SupplierCertId="certId+''"
-                         :canadd="true"
+                         :canadd="formData.Status <= '0'"
                          height="360px"
                          style="margin-top: 20px"></manufacturer-list>
     </el-card>
@@ -715,7 +715,7 @@
       <el-row>
         <el-col :span="24">
           <span>现场考察报告</span>
-          <el-button :disabled="parseInt(certId) === 0" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
+          <el-button v-if="formData.Status <= '0'" :disabled="parseInt(certId) === 0" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
           </el-button>
           <!--<el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"-->
           <!--:http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">-->
@@ -776,14 +776,13 @@ import uploadajax from '../../assets/js/uploadajax.js'
 import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
 
 // v-viewer
-  import Vue from 'vue';
-  import Viewer from 'v-viewer'
-  import 'viewerjs/dist/viewer.css'
-  Vue.use(Viewer)
-  Viewer.setDefaults({
-    Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
-  })
-
+import Vue from 'vue'
+import Viewer from 'v-viewer'
+import 'viewerjs/dist/viewer.css'
+Vue.use(Viewer)
+Viewer.setDefaults({
+  Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
+})
 
 export default {
   name: 'goodsinfo',
@@ -811,10 +810,6 @@ export default {
     appendStatus: {
       type: Boolean,
       default: false
-    },
-    isInvestigate: {
-      type: Boolean,
-      default: false
     }
   },
   components: {
@@ -935,21 +930,8 @@ export default {
     return {
       manufacturerList: [],
       certId: 0,
-      formDataCert: {
-        InStyle: '1',
-        WorkerTotal: 0,
-        ContractNum: 0,
-        UniversityNum: 0,
-        TechnicalNum: 0,
-        AboveProfNum: 0,
-        MiddleProfNum: 0,
-        NationalRegNum: 0,
-        NationalCertTotal: 0,
-        DesignerTotal: 0,
-        SkillerTotal: 0,
-        Status: 0
-      },
       visible: false,
+      isInvestigate: false,
       address: [],
       linkaddress: [],
       showorhidflag: 'hid',
@@ -1289,10 +1271,12 @@ export default {
         })
     },
     getSupplierSceneFile () {
+      console.log('不设置下显示显示？')
       if (this.formData.Id !== '') {
         let params = {
           SupplierId: this.formData.Id
         }
+        this.isInvestigate = true
         this.$axios.get('/supplier/getscenefilelist', {params}).then(res => {
           this.scenefile = res.data.item
           if (this.scenefile && this.scenefile != null) {

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

@@ -325,7 +325,7 @@ export default {
   data () {
     return {
       loading: false,
-      tableloading:false,
+      tableloading: false,
       keyword: '',
       Ids: [],
       SupplierId: 0,
@@ -502,6 +502,7 @@ export default {
       this.sectionCert = val
     },
     getvalue (SupplierId, SupplierTypeCode, certId) {
+      console.log('走的这个value')
       this.SupplierId = SupplierId
       this.SupplierTypeCode = SupplierTypeCode
       this.SupplierCertId = certId

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="manufacturerList" border size="mini">
-      <el-table-column label="操作" width="150" align="center" fixed>
+      <el-table-column v-if="canadd" label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
           <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)" :disabled="!canadd">
             编辑</el-button>
@@ -161,6 +161,7 @@ Viewer.setDefaults({
       },
       getvalue (certId) {
         this.SupplierCertId = certId
+        console.log('进来了')
         this.initData()
       },
       initData () {

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

@@ -701,6 +701,7 @@
             if (this.formData.CredentialFlag != '') {
               this.$refs['GoodsInfo'].showorhid(this.formData.CredentialFlag)
             }
+            this.$refs['GoodsInfo'].initMaunfactureList(this.certId)
             if (this.formData.Status != 4) {
               this.delete_flat = false
             }