huahaiyan 6 gadi atpakaļ
vecāks
revīzija
18a385fdbd

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -380,7 +380,7 @@
               _this.suplen = _this.supplierList.length
               _this.suplen = _this.supplierList.length
             }
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
-              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].Id)
+              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
             }
           })
           })

+ 3 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -381,8 +381,9 @@
             if (_this.supplierList) {
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
               _this.suplen = _this.supplierList.length
             }
             }
+            console.log("---_this.supplierList-",_this.supplierList)
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
-              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].Id)
+              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
             }
           })
           })
@@ -458,6 +459,7 @@
         this.addshow = true
         this.addshow = true
       },
       },
       addauditcom() {
       addauditcom() {
+        console.log("---this.entityForm-",this.entityForm)
         api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
         api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
           if (res.data.code === 0) {
           if (res.data.code === 0) {
             //保存成功后,初始化数据,变成修改
             //保存成功后,初始化数据,变成修改

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -379,7 +379,7 @@
               _this.suplen = _this.supplierList.length
               _this.suplen = _this.supplierList.length
             }
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
-              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].Id)
+              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
             }
           })
           })

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -380,7 +380,7 @@
               _this.suplen = _this.supplierList.length
               _this.suplen = _this.supplierList.length
             }
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
             if (_this.IsCompanyUser == 1 && _this.supplierList) {
-              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].Id)
+              _this.entityForm.SupplierId = parseInt(_this.supplierList[0].SupplierId)
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
               _this.entityForm.SupplierName = _this.supplierList[0].SupplierName
             }
             }
           })
           })

+ 4 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -42,7 +42,7 @@
             <el-row>
             <el-row>
               <el-col :span="8">
               <el-col :span="8">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable
+                  <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1" v-model="supplierOptions" filterable
                     @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                     @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                       :value="item.SupplierId">
@@ -471,10 +471,12 @@
         dialogSize: 10,
         dialogSize: 10,
         dialogCurrentPage: 1,
         dialogCurrentPage: 1,
         dialogCurrentItemCount: 0,
         dialogCurrentItemCount: 0,
-        waituploads: []
+        waituploads: [],
+        IsCompanyUser: '',
       }
       }
     },
     },
     created() {
     created() {
+      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       // this.serviceType = this.$route.params.opera //获取服务类型
       // this.serviceType = this.$route.params.opera //获取服务类型
       this.Id = this.$route.query.Id
       this.Id = this.$route.query.Id
       this.editFlag = this.$route.query.editFlag
       this.editFlag = this.$route.query.editFlag

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

@@ -50,7 +50,7 @@
               </el-col> -->
               </el-col> -->
               <el-col :span="8">
               <el-col :span="8">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable
+                  <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1" v-model="supplierOptions" filterable
                     @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                     @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                       :value="item.SupplierId">

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

@@ -49,7 +49,7 @@
               </el-col> -->
               </el-col> -->
               <el-col :span="8">
               <el-col :span="8">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
                 <el-form-item label="供应商公司名称" prop="checkSelectedSupplier">
-                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应商公司"
+                  <el-select ref="suppselect" :disabled="formData.Status>0||IsCompanyUser == 1" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应商公司"
                     style="width: 100%">
                     style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
                       :value="item.SupplierId">