增项审批通过技术服务类，物资类

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -145,7 +145,7 @@ func (this *OilSupplierCertAppendController) GetSupplier() {
 
 	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	sqlStr := "SELECT b.Id AS SupplierId, a.Id AS SupplierCertId, b.SupplierName AS SupplierName FROM OilSupplierCert AS a LEFT JOIN OilSupplier AS b ON a.SupplierId = b.Id "
-	where := "WHERE b.Id is NOT NULL AND a.SupplierTypeCode = " + Id + " AND  a.CreateUserId = " + this.User.Id
+	where := "WHERE b.Id is NOT NULL AND a.SupplierTypeCode = " + Id
 
 	sqlStr = sqlStr + where
 

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

@@ -73,9 +73,14 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable allow-create
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
             <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </el-option>
@@ -96,12 +101,52 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="审核" :visible.sync="dialogMakeSure2">
+      <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
+          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
+            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
+        <el-form-item :label="aduitlabel"
+          v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
+            default-first-option>
+            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态">
+          <template>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+          </template>
+        </el-form-item>
+        <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top: -25px">
+        <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+        <el-form-item label="审批人部门">
+          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
+            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
+          </el-cascader>
+        </el-form-item>
         <el-form-item label="审批人">
-          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable allow-create
+          <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in secauditerOptions" :key="item.userid" :label="item.username" :value="item.userid">
             </el-option>
           </el-select>
         </el-form-item>
@@ -261,6 +306,7 @@
       this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
       //获取需要修改的增项信息
@@ -298,12 +344,23 @@
       isAccess() {
         apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
           this.auditBtn = res.data
-          console.log("---this.auditBtn --",this.auditBtn )
         }).catch(err => {
           console.log(err)
         })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取增项分类表
       getSortList() {
         //分页及列表条件

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

@@ -314,6 +314,7 @@
       this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
       //获取需要修改的增项信息
@@ -355,6 +356,18 @@
         })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '01', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取增项分类表
       getSortList() {
         //分页及列表条件

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

@@ -213,6 +213,7 @@
         AuditdialogShow: false, //提交审核弹框
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
+        secorgtreelist: [],
         majorDept: [],
         auditbusList: [], // 待审核业务
         dialogMakeSure: false,
@@ -333,6 +334,7 @@
       this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
       //获取需要修改的增项信息
@@ -374,6 +376,18 @@
         })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '03', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取增项分类表
       getSortList() {
         //分页及列表条件