Browse Source

提交审核的样式

yuedefeng 6 years ago
parent
commit
5546d9e5b2

+ 11 - 7
src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="选择审核人员" :visible.sync="visible" top="5vh" width="800px">
+    <el-dialog title="选择审核人员" :visible="visible" @close="hideChooseAuditer" top="5vh" width="800px">
       <el-form label-width="110px" ref="EntityForm" :model="formData">
         <el-row :gutter="10">
           <el-col :span="12">
@@ -15,12 +15,12 @@
           <el-col :span="12">
             <el-card style="width: 100%;height: calc(100vh - 253px);overflow: auto">
               <el-table :data="userOptions" style="width: 100%" ref="multipleTable"
-                @selection-change="handleSelectionChange">
+                        @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <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>
@@ -52,6 +52,7 @@
         </el-row>
       </el-form>
     </el-dialog>
+
   </div>
 </template>
 
@@ -80,7 +81,7 @@
         default: false
       }
     },
-    watch: {
+    /*watch: {
       visible(val) {
         this.selfVisible = val
         if (this.visible) {
@@ -90,7 +91,7 @@
       selfVisible(val) {
         this.$emit('update:visible', val)
       }
-    },
+    },*/
     data() {
       return {
         userOptions: [],
@@ -171,8 +172,11 @@
           this.$refs.multipleTable.toggleRowSelection(row[row.length-1])
         }
       },
-      toggleSelection(val) {
-        this.$emit('close', this.selectedOptions.id)
+      toggleSelection () {
+        this.$emit('close', this.selectedOptions.id, this.selectedOptions.realname)
+      },
+      hideChooseAuditer () {
+        this.$emit('hideChooseAuditer')
       },
     }
   }

+ 33 - 11
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -204,23 +204,35 @@
       </el-tabs>
     </el-card>
 
-    <!-- <el-dialog title="选择审批单位" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="110px">
+    <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
+      <el-form ref="searchForm" label-width="70px">
         <el-row>
-          <el-col :span="24">
+          <!--<el-col :span="24">
             <el-form-item label="二级单位">
               <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
                 filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
               </el-cascader>
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="24">
             <el-form-item label="审批人">
-              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
+              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
                 allow-create default-first-option>
                 <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select>-->
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input
+                type="textarea"
+                placeholder="请输入说明内容"
+              >
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -229,9 +241,10 @@
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
-    </el-dialog> -->
+    </el-dialog>
+
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false" :visible="chooseAuditorVisible"></choose-auditor>
 
-    <choose-auditor ref="chooseAuditor" @close="AuditEntity" :visible.sync="dialogVisible"></choose-auditor>
   </div>
 </template>
 
@@ -281,6 +294,7 @@
 
     data() {
       return {
+        chooseAuditorVisible: false,
         showReturn: 1,
         IsCompanyUser: 0,
         dialogVisible: false,
@@ -298,6 +312,7 @@
         orgtreelist: [],
         secOrganize: [],
         auditer: '',
+        auditerName: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
@@ -628,7 +643,6 @@
       },
       auditOrgChang(val) {
         let deptid = val[val.length - 1]
-        console.log(deptid)
         this.auditerOption = []
         this.auditer = ''
         let auditstepcode = 'FIRST_TRIAL'
@@ -756,11 +770,19 @@
         })
       },
       selectAuditOrg() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.dialogVisible = true
       },
-      AuditEntity(val) {
+      chooseAuditorShow () {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer (val, name) {
         this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+      AuditEntity () {
+        //this.auditer = val
         if (this.auditer === '') {
           this.$message({
             type: 'warning',