初审

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

@@ -511,21 +511,20 @@
               return
             }
           }
-          // if (this.subfileList && this.subfileList.length > 0) {
-          //   for (var i = 0; i < this.subfileList.length; i++) {
-          //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-          //       this.$message({
-          //         type: 'warning',
-          //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-          //       })
-          //       return
-          //     }
-          //   }
-          //   this.$emit('close')
-          // } else {
-          //   this.$emit('close')
-          // }
-          this.$emit('close')
+          if (this.subfileList && this.subfileList.length > 0) {
+            for (var i = 0; i < this.subfileList.length; i++) {
+              if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+                })
+                return
+              }
+            }
+            this.$emit('close')
+          } else {
+            this.$emit('close')
+          }
         } else {
           this.$message({
             type: 'warning',

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

@@ -606,7 +606,7 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="Status <= 0">添加</el-button>
             </div>
             <el-table :data="subfileList" border>
               <el-table-column label="操作" width="150" align="center" fixed v-if="Status <= 0">

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

@@ -691,7 +691,7 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="Status <= 0">添加</el-button>
             </div>
             <el-table :data="subfileList" border>
               <el-table-column label="操作" width="150" align="center" fixed v-if="Status <= 0">

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

@@ -524,7 +524,7 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" >添加</el-button>
+              <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="Status <= 0">添加</el-button>
             </div>
             <el-table :data="subfileList" border>
               <el-table-column label="操作" width="150" align="center" fixed v-if="Status <= 0">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -49,10 +49,24 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="初审人员" prop="FirstAuditName" :rules="{ required: true, message: '初审人员不能为空', trigger: 'change'}">
-              <el-input ref="selectAuditer" readonly v-model="formData.FirstAuditName" placeholder="请选择初审人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow" :readonly="formData.Status > 0"></el-button>
-              </el-input>
+            <el-form-item label="初审人员" prop="FirstAudit" :rules="{ required: true, message: '初审人员不能为空', trigger: 'change'}">
+              <!--<el-input ref="selectAuditer" readonly v-model="formData.FirstAuditName" placeholder="请选择初审人">-->
+                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow" :readonly="formData.Status > 0"></el-button>-->
+              <!--</el-input>-->
+              <el-select ref="selectAuditer"
+                         v-model="formData.FirstAudit"
+                         placeholder="请选择初审人"
+                         style="width: 100%"
+                         filterable
+                         allow-create
+                         default-first-option
+                         @change="auditOrgChang()">
+                <el-option v-for="item in firOptions"
+                           :key="item.Id"
+                           :label="item.Realname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -354,6 +368,7 @@
       }
 
       return {
+        firOptions: [],
         showaddmarketdialog: false,
         dialogMakeSure: false,
         audithistoryshow: false,
@@ -486,8 +501,18 @@
       } else {
         this.formData.Id = 0
       }
+      this.getFirAuditerByDept()
     },
     methods: {
+      getFirAuditerByDept () {
+        let deptid = this.authUser.Profile.DepartmentId
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
+        sipapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.firOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 审批
       approvalEntity () {
         this.dialogMakeSure = true
@@ -633,11 +658,11 @@
         this.formData.FirstAudit = val
         this.formData.FirstAuditName = name
         this.chooseAuditorVisible = false
-        this.auditOrgChang(this.formData.FirstAudit)
+        // this.auditOrgChang(this.formData.FirstAudit)
       },
-      auditOrgChang (val) {
+      auditOrgChang () {
         let auditstepcode = 'SECOND_TRIAL'
-        sipapi.getAuditerByFirst(val, auditstepcode, this.$axios)
+        sipapi.getAuditerByFirst(this.formData.FirstAudit, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })