前:改企业信息变颜色的优先级;增项添加加loading

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -48,12 +48,11 @@
                                :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
               </el-autocomplete> -->
                     <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" :readonly="formData.Status > 0"
-                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
-                              v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-                    </el-input>
-                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"
-                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%">
                     </el-input>
+<!--                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"-->
+<!--                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">-->
+<!--                    </el-input>-->
                   </el-form-item>
                 </el-col>
 
@@ -2318,11 +2317,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
    }
 }
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -50,12 +50,11 @@
                                :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
               </el-autocomplete> -->
                     <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" :readonly="formData.Status > 0"
-                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
-                              v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-                    </el-input>
-                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"
-                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%">
                     </el-input>
+<!--                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"-->
+<!--                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">-->
+<!--                    </el-input>-->
                   </el-form-item>
                 </el-col>
 
@@ -355,7 +354,7 @@
                 <el-col :span="8">
                   <el-form-item label="HSE审查培训">
                     <!--<el-input v-model="supplierData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :readonly="formData.Status > 0"
+                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="formData.Status > 0"
                                :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                       <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                                  style="width: 100%">
@@ -2472,11 +2471,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
    .photoStyle{

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -49,12 +49,11 @@
                                :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
               </el-autocomplete> -->
                     <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" :readonly="formData.Status > 0"
-                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
-                              v-if="authUser && authUser.Profile.IsCompanyUser == 1">
-                    </el-input>
-                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"
-                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+                              v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%">
                     </el-input>
+<!--                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"-->
+<!--                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">-->
+<!--                    </el-input>-->
                   </el-form-item>
                 </el-col>
 
@@ -2315,11 +2314,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .photoStyle{

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

@@ -2864,11 +2864,11 @@ export default {
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .photoStyle{

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

@@ -2624,11 +2624,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .photoStyle{

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

@@ -3313,11 +3313,11 @@ import Viewer from 'v-viewer'
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .photoStyle{

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

@@ -3451,11 +3451,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
    .photoStyle{

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

@@ -3285,11 +3285,11 @@ import Viewer from 'v-viewer'
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .photoStyle{

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

@@ -2654,11 +2654,11 @@
 <style lang='scss'>
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .formDataInfo .el-input__inner[disabled]{

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

@@ -1920,11 +1920,11 @@
 <style lang="scss">
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
    .photoStyle{

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

@@ -2766,11 +2766,11 @@
   }
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
 .el-pagination {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -3143,11 +3143,11 @@
   }
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .attach-uploader .el-upload:hover {

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

@@ -3647,11 +3647,11 @@
   }
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .attach-uploader .el-upload:hover {

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

@@ -3195,11 +3195,11 @@
   }
   .modified-form-input {
     .el-input__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
 
     .el-textarea__inner {
-      background-color: wheat;
+      background-color: wheat !important;
     }
   }
   .attach-uploader .el-upload {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -19,7 +19,7 @@
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
                        style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
-              @click="addAppendCom">添加
+              @click="addAppendCom" :loading="addLoading">添加
             </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -204,7 +204,7 @@
         </el-form>
         <span style="float: right;margin-top:-10px;">
           <el-button size="small" @click="addshow = false">取 消</el-button>
-          <el-button type="primary" size="small" @click="addAppendCom">确 定</el-button>
+          <el-button type="primary" size="small" @click="addAppendCom" :loading="addLoading">确 定</el-button>
         </span>
         <br>
       </el-dialog>
@@ -237,6 +237,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
       return {
         tableLoading: false,
         addshow: false,
+        addLoading: false,
         historyVisible: false,
         dialogVisible: false, // 高级查询
         // 列表数据
@@ -365,12 +366,14 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
           type: 'warning'
         })
           .then(() => {
+            _this.addLoading = true
             _this.appendformData.AppendType = '02'
             _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             console.log(_this.appendformData, '222')
             if (!_this.appendformData.SupplierId && _this.IsCompanyUser == 0) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -386,6 +389,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
             if (!tempSupplierName) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -407,10 +411,12 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
                     type: 'success',
                     message: res.data.message
                   })
+                  _this.addLoading = false
                   _this.addshow = false
                 } else {
                   _this.appendformData.SupplierId = ''
                   _this.appendformData.Remark = ''
+                  _this.addLoading = false
                   _this.$message({
                     type: 'warning',
                     message: res.data.message
@@ -420,6 +426,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
               .catch(err => {
                 _this.appendformData.SupplierId = ''
                 _this.appendformData.Remark = ''
+                _this.addLoading = false
                 console.error(err)
               })
           })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -18,7 +18,7 @@
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
                        style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
-              @click="addAppendCom">添加
+              @click="addAppendCom" :loading="addLoading">添加
             </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -203,7 +203,7 @@
         </el-form>
         <span style="float: right;margin-top:-10px;">
           <el-button size="small" @click="addshow = false">取 消</el-button>
-          <el-button type="primary" size="small" @click="addAppendCom">确 定</el-button>
+          <el-button type="primary" size="small" @click="addAppendCom" :loading="addLoading">确 定</el-button>
         </span>
         <br>
       </el-dialog>
@@ -237,6 +237,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
       return {
         tableLoading: false,
         addshow: false,
+        addLoading: false,
         historyVisible: false,
         dialogVisible: false, // 高级查询
         // 列表数据
@@ -369,12 +370,15 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
           type: 'warning'
         })
           .then(() => {
+            _this.addLoading = true
+            console.log(_this.addLoading, this.addLoading, '_this.addLoading')
             _this.appendformData.AppendType = '01'
             console.log(_this.appendformData.SupplierId, '增项申请主表')
             _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             if (!_this.appendformData.SupplierId && _this.IsCompanyUser == 0) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -390,6 +394,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
             if (!tempSupplierName) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -411,10 +416,12 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
                     type: 'success',
                     message: res.data.message
                   })
+                  _this.addLoading = false
                   _this.addshow = false
                 } else {
                   _this.appendformData.SupplierId = ''
                   _this.appendformData.Remark = ''
+                  _this.addLoading = false
                   _this.$message({
                     type: 'warning',
                     message: res.data.message
@@ -424,6 +431,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
               .catch(err => {
                 _this.appendformData.SupplierId = ''
                 _this.appendformData.Remark = ''
+                this.addLoading = false
                 console.error(err)
               })
           })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -19,7 +19,7 @@
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
                        style="margin-left:10px; margin-top: -4px;" @click="addappend">添加</el-button>
             <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
-              @click="addAppendCom">添加
+              @click="addAppendCom" :loading="addLoading">添加
             </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -206,7 +206,7 @@
         </el-form>
         <span style="float: right;margin-top:-10px;">
           <el-button size="small" @click="addshow = false">取 消</el-button>
-          <el-button type="primary" size="small" @click="addAppendCom">确 定</el-button>
+          <el-button type="primary" size="small" @click="addAppendCom" :loading="addLoading">确 定</el-button>
         </span>
         <br>
       </el-dialog>
@@ -240,6 +240,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
       return {
         tableLoading: false,
         addshow: false,
+        addLoading: false,
         historyVisible: false,
         dialogVisible: false, // 高级查询
         // 列表数据
@@ -368,11 +369,13 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
           type: 'warning'
         })
           .then(() => {
+            _this.addLoading = true
             _this.appendformData.AppendType = '03'
             _this.appendformData.SupplierId = parseInt(_this.appendformData.SupplierId)
             if (!_this.appendformData.SupplierId && _this.IsCompanyUser == 0) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -388,6 +391,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
             if (!tempSupplierName) {
               _this.appendformData.SupplierId = ''
               _this.appendformData.SupplierName = ''
+              _this.addLoading = false
               _this.$message({
                 type: 'warning',
                 message: '请选择供应商公司'
@@ -410,10 +414,12 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
                     type: 'success',
                     message: res.data.message
                   })
+                  _this.addLoading = false
                   _this.addshow = false
                 } else {
                   _this.appendformData.SupplierId = ''
                   _this.appendformData.Remark = ''
+                  _this.addLoading = false
                   _this.$message({
                     type: 'warning',
                     message: res.data.message
@@ -423,6 +429,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
               .catch(err => {
                 _this.appendformData.SupplierId = ''
                 _this.appendformData.Remark = ''
+                _this.addLoading = false
                 console.error(err)
               })
           })