问题修改

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

@@ -131,7 +131,7 @@
           <el-form-item label="中石油准入证编号">
             <el-input v-model="formData.PACNumber"
                       maxlength="255"
-                      :readonly="this.formData.Status != '7'&&!appendStatus"
+                      :readonly="(this.formData.Status != '7'&&!appendStatus)&&this.formData.Grade==2"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -160,7 +160,7 @@
                        v-model="formData.MgrUnit"
                        maxlength="255"
                        clearable
-                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       :disabled="(this.formData.Status > '0'&&!appendStatus) || (this.formData.Grade == '1') "
                        placeholder="请输入"
                        style="width: 100%">
               <el-option v-for="item in ManagementUnitOptions"
@@ -697,7 +697,7 @@
     </el-form>
     <!--打印内容结束-->
     <!--endprint1-->
-    <el-row v-if="(isInvestigate) && (formData.OperType == '制造商' && formData.Grade == '2')" >
+    <el-row v-if="(isInvestigate) && (formData.InStyle != '2')" >
       <el-col :span="4">
         <span>现场考察报告</span>
         <el-button type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
@@ -1271,6 +1271,7 @@ export default {
         this.formData.MgrUnit = '中油集团公司'
       } else {
         this.formData.MgrUnit = ''
+        this.formData.PACNumber = ''
       }
     },
     InStyleChange (val) {

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

@@ -184,6 +184,10 @@
         type: String,
         default: ''
       },
+      InStyle: {
+        type: String,
+        default: ''
+      },
       OperType: {
         type: String,
         default: ''
@@ -502,7 +506,7 @@
               }
             }
           }
-          if ((this.isInvestigate) && (this.Grade === '2' && this.OperType === '制造商')) {
+          if ((this.isInvestigate) && (this.InStyle != '2')) {
             if (this.scenefile.Id == '' || this.scenefile.Id == '0') {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -50,9 +50,9 @@
                                  slot="append"
                                  placeholder="登录类型"
                                  style="width: 108px;">
-                        <el-option label="PTR认证"
+                        <el-option label="管理用户"
                                    :value="2"></el-option>
-                        <el-option label="普通账户"
+                        <el-option label="企业用户"
                                    :value="1"></el-option>
                       </el-select>
                     </el-input>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymentsure.vue

@@ -202,7 +202,7 @@
         this.dialogVisible = true
       },
       BillSureClickConfirm () {
-        this.$confirm('请您确认信息准确无误后交费，电子发票将发送至预留电子邮箱，是否继续？', '提示', {
+        this.$confirm('请您确认信息准确无误后交费，电子发票将以短信形式发送至您手机，是否继续？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'info'

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

@@ -325,6 +325,7 @@
                         :canadd="add_flat"
                         :flag="flag"
                         :Grade="formData.Grade"
+                        :InStyle="formData.InStyle"
                         :OperType="formData.OperType"
                         :isInvestigate="isInvestigate"
                         @close="selectAuditOrg"></subfile-list>
@@ -1479,15 +1480,22 @@ export default {
       this.$refs['GoodsInfo'].$refs['EntityFormCert'].validate((valid) => {
         valid2 = valid
       })
+      if (this.formData.Grade == 1 && this.formData.PACNumber == '') {
+        this.$message({
+          type: 'warning',
+          message: '中石油准入证编号不能为空！'
+        })
+        return
+      }
       if (this.formData.OperType === '制造商') {
-        if (!this.formData.MaunLicense && !this.formData.SafetyLicense) {
-          valid1 = false
-          this.$message({
-            type: 'warning',
-            message: '【生产制造许可证获证情况及编号】或【安全生产许可证】 为必填项'
-          })
-          return
-        }
+        // if (!this.formData.MaunLicense && !this.formData.SafetyLicense) {
+        //   valid1 = false
+        //   this.$message({
+        //     type: 'warning',
+        //     message: '【生产制造许可证获证情况及编号】或【安全生产许可证】 为必填项'
+        //   })
+        //   return
+        // }
       } else if (this.formData.OperType === '代理商') {
         if (!this.formData.MaunAgent) {
           valid1 = false