Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/form/demoForm2.vue

@@ -64,7 +64,8 @@ import PersonnelFilesModal from './personnelFilesModal'
 import CarSqModal from './carSqModal'
 import MaterialSlModal from './materialSlModal'
 import FixedZyModal from './fixedZyModal'
-import { postAction, postFormDataAction } from '@/api/manage'
+import { postAction, postFormDataAction} from '@/api/manage'
+// import {annualLeave} from '@api/oa/cd-personnel-files'
 import moment from 'moment'
 export default {
     name: 'DemoForm',
@@ -494,11 +495,28 @@ export default {
                    //表中每一行分别计算
                     value.map(b=>{
                       b[item.bn[0].label] = b[number1]*b[number2]  
+                      if(this.$store.getters.nickname=='崔崇杰'){
+                           b['procurement_type']='1'
+                      }else{
+                          b['procurement_type']='2'
+                      }
+                      
                     })   
                })
          },
          specialTerms(value,key){
             var that = this
+            //剩余年假
+            // if(key == 'employe_name'){
+            //       annualLeave({username:value}).then(res => {
+            //         if (res.success) {
+            //         //   this.declareElementsData = res.result.records
+            //           //  this.dataSource =res.result.records
+            //         }else{
+            //            this.$message.error(res.message);
+            //         }
+            //     })
+            // }
              //请假类型与单位
             //事假
             if(key == 'leave_category' && value == '1'){

src/views/activiti/form/personnelFilesModal.vue

@@ -1,8 +1,9 @@
 <template>
-  <div id="declareElementsModal">
+  <div id="declareElementsModal" ref="declareElementsModal">
     <a-modal
       title="人员档案"
       v-model="declareElementsModVis"
+       :getContainer ='()=>$refs.declareElementsModal'
       @cancel="handleCancel"
       width="80%"
       style="top:330px;left:100px;"
@@ -20,7 +21,7 @@
               :data-source="declareElementsData"
               :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
               :pagination="false"
-               :scroll="{y: 300}"
+               :scroll="{y:300}"
             >
               
             </a-table>
@@ -74,13 +75,13 @@ export default {
            {
           title: '员工姓名',
           dataIndex: 'realname',
-          width: 90,
+          width:'48%',
           className: 'replacecolor',
         },
          {
           title: '岗位',
           dataIndex: 'post',
-          width: 90,
+          width:'50%',
           className: 'replacecolor',
         },
       ],
@@ -160,9 +161,15 @@ export default {
   background-color: #f0f2f5;
 }
 /deep/ .ant-modal-body {
-  padding: 10px;
+  // padding: 10px;
+  margin:0 !important;
+  margin-left: 0px !important;
 }
 /deep/.ant-form-item{
   margin-bottom: 0px !important;
+}
+ /deep/.ant-modal{
+      top: 106px !important;
+    left: 10px !important;
 }
 </style>