初审部门

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

@@ -20,7 +20,7 @@
                 <el-table-column prop="realname" label="可选用户">
                   <template slot="header" slot-scope="scope">
                     <el-button type="primary" style="float: right;" size="small" @click="toggleSelection">
-                      选择用户 <el-icon class="el-icon-d-arrow-right"></el-icon>
+                      确认审核人 <el-icon class="el-icon-d-arrow-right"></el-icon>
                     </el-button>
                   </template>
                 </el-table-column>
@@ -114,9 +114,9 @@
         let _this = this
         let params = {
           IsInnerOrganize: 1,
-          // ParentId: 100000180,
+          // ParentId: 0
         }
-        _this.$axios.get('organizes/listbydeptid', {
+        _this.$axios.get('organizes/orgalllist', {
             params
           })
           .then(res => {
@@ -153,7 +153,7 @@
           return
         } else {
           this.$refs.multipleTable.clearSelection()
-          this.$refs.multipleTable.toggleRowSelection(row[row.length-1])        
+          this.$refs.multipleTable.toggleRowSelection(row[row.length-1])
         }
       },
       toggleSelection(val) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -206,33 +206,34 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+
+        <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-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="请选择组织">
+                       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="请选择组织">
+                       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' ">
+                      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>
+                     default-first-option>
             <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
             </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="dialogMakeSure2 = false">取 消</el-button>

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

@@ -216,6 +216,16 @@
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
+
+        <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-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"
@@ -239,15 +249,6 @@
             </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="dialogMakeSure2 = false">取 消</el-button>