element-ui 升级到2.8.2

src/dashoo.cn/frontend_web/package.json

@@ -22,7 +22,7 @@
     "chart.js": "^2.7.0",
     "cross-env": "^5.1.1",
     "echarts": "^3.8.5",
-    "element-ui": "^2.2.2",
+    "element-ui": "^2.8.2",
     "es6-promise": "^4.1.1",
     "highcharts": "^5.0.15",
     "js-cookie": "^2.1.4",

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

@@ -226,13 +226,25 @@
         <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="请选择组织">
-          </el-cascader>
+
+        <el-divider></el-divider>
+
+        <el-form-item :label="aduitlabel" v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
+          <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
+            <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
+          </el-input>
+          <!--<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.id"
+              :label="item.realname"
+              :value="item.id">
+            </el-option>
+          </el-select>-->
         </el-form-item>
-        <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
+
+        <!--<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="请选择组织">
@@ -248,7 +260,17 @@
               :value="item.id">
             </el-option>
           </el-select>
+        </el-form-item>-->
+
+        <el-divider></el-divider>
+
+        <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>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
@@ -280,6 +302,9 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+                    :visible="chooseAuditorVisible"></choose-auditor>
   </div>
 </template>
 
@@ -300,9 +325,11 @@
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
   import BusinessList from '@/components/oilsupplier/businesslist'
+  import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
     components: {
+      ChooseAuditor,
       SupplierFileTable,
       WfHistory,
       SupplierCertEdit,
@@ -324,6 +351,9 @@
 
     data () {
       return {
+        auditer: '',
+        auditerName: '',
+        chooseAuditorVisible: false,
         equipmentList: [], // 企业主要装备情况
         performanceList: [], // 近三年主要工程业绩
         patentList: [], // 拥有专利、专有技术及工法
@@ -484,6 +514,17 @@
         this.$refs['winningList'].showDialog()
       },
 
+
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
+      setAuditer(val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisible = false
+      },
+
       initDatas () {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {