lining пре 6 година
родитељ
комит
0e9c729a63

+ 48 - 10
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -248,8 +248,33 @@
       </span>
       <br>
     </el-dialog>
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
-      :visible="chooseAuditorVisible"></choose-auditor>>
+      :visible="chooseAuditorVisible"></choose-auditor>
+    <choose-auditor-fen ref="chooseAuditorFen" @close="setAuditerFen" @hideChooseAuditer="chooseAuditorVisibleFen=false"
+                        :visible="chooseAuditorVisibleFen" typeCode="01"></choose-auditor-fen>
   </div>
 </template>
 
@@ -259,7 +284,7 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import annualapi from '@/api/oilsupplier/annualaudit'
-import apiCert from '@/api/oilsupplier/suppliercert'
+  import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
@@ -269,11 +294,12 @@ import apiCert from '@/api/oilsupplier/suppliercert'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import GoodsList from '@/components/oilsupplier/goodslist';
-  import GoodsInfo from '@/components/oilsupplier/goodsinfo';
+  import GoodsList from '@/components/oilsupplier/goodslist'
+  import GoodsInfo from '@/components/oilsupplier/goodsinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import SubfileList from '@/components/oilsupplier/subfilelist'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
   export default {
     computed: {
@@ -294,12 +320,15 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       GoodsInfo,
-      ChooseAuditor
+      ChooseAuditor,
+      ChooseAuditorFen
     },
     name: 'oiltechnologyserviceEdit',
 
     data () {
       return {
+        chooseAuditorVisibleFen: false,
+        ComAuditdialogShow: false,
         savebtn: true,
         visbtn: '1',
         fushenauditer: '', // 复审人员
@@ -465,7 +494,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
     },
     created () {
       this.serviceId = this.$route.params.opera
-    if (this.$route.query.certid) {
+      if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
       this.Status = this.$route.query.Status + ''
@@ -487,11 +516,20 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      setAuditerFen (val, name) {
+        this.auditer = val
+        this.auditerName = name
+        this.chooseAuditorVisibleFen = false
+      },
+      chooseAuditorShowFen () {
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
       getstatus (annid) {
         annualapi.getEntity(annid, this.$axios)
           .then(res => {
             this.formannData = res.data
-          console.log('--forann-', this.formannData)
+            console.log('--forann-', this.formannData)
             this.Status = this.formannData.Status
             this.entrydetail.business = this.formannData.Id
             this.entrydetail.instance = this.formannData.WorkflowId
@@ -499,8 +537,8 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           })
           .catch(err => {
             console.error(err)
-        })
-    },
+          })
+      },
       inputCompany (val) {
         if (!this.certId) {
           api.getEntityByName(val, this.$axios).then(res => {
@@ -752,7 +790,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
         this.$refs['GoodsInfo'].$refs['EntityFormCert'].validate((valid) => {
           valid2 = valid
         })
-  
+
 
         if (valid1 && valid2) {
           if (!this.formData.SetupTime) {

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -337,7 +337,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
-import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
+  import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import setapi from '@/api/oilsupplier/oilclassorgset'
 
   export default {