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

src/views/activiti/form/demoForm2.vue

@@ -52,6 +52,8 @@
     </a-card>
     <personnel-files-modal ref="personnelFilesModal" @close="closeP"></personnel-files-modal>
     <fixed-zy-modal ref="FixedZyModal" @close="closeP"></fixed-zy-modal>
+    <car-sq-modal ref="CarSqModal" @close="closeP"></car-sq-modal>
+    <material-sl-modal ref="MaterialSlModal" @close="closeP"></material-sl-modal>
   </div>
 </template>
 
@@ -59,6 +61,8 @@
 import pick from 'lodash.pick'
 import todoManageOperation from '../operation/todoManageOperation'
 import PersonnelFilesModal from './personnelFilesModal'
+import CarSqModal from './carSqModal'
+import MaterialSlModal from './materialSlModal'
 import FixedZyModal from './fixedZyModal'
 import { postAction, postFormDataAction } from '@/api/manage'
 import moment from 'moment'
@@ -86,7 +90,9 @@ export default {
         todoManageOperation,
         moment,
         PersonnelFilesModal,
-        FixedZyModal
+        FixedZyModal,
+        CarSqModal,
+        MaterialSlModal
     },
     data () {
         return {
@@ -143,6 +149,8 @@ export default {
                 newName.fixed_gh =this.fixedGh
                 newName.fixed_db=this.fixedDb
                 newName.fixed_bf=this.fixedBf
+                newName.car_sq = this.carSq
+                newName.material_sl = this.materialSl
             },
             immediate: true,
             deep: true
@@ -273,6 +281,14 @@ export default {
             this.$refs.FixedZyModal.personLists('报废')
             this.$refs.FixedZyModal.sat = '报废'
         },
+        carSq(){
+             this.$refs.CarSqModal.carSqModVis = true
+            this.$refs.CarSqModal.personLists('报废')
+        },
+        materialSl(){
+             this.$refs.MaterialSlModal.materialSlModVis = true
+            this.$refs.MaterialSlModal.personLists('报废')
+        },
         closeP(value){
              var that = this
             this.cvarr.map(item=>{
@@ -970,14 +986,14 @@ export default {
         },
         //计算时间差
         timeDifference(start, end,state){
-            if(start>end){
-               this.$message.error('起始时间不可大于结束时间');
-            }else{
+            // if(start>end){
+            //    this.$message.error('起始时间不可大于结束时间');
+            // }else{
               let beginTime = (new Date(start).getTime()) / 1000;
               let endTime = (new Date(end).getTime()) / 1000;
                //计算天数
               var timediff = endTime - beginTime;
-              var days = parseInt(timediff / 86400);
+              var days = parseInt(timediff / 86400);  //60*60*24
              //计算小时数
              var remain = timediff % 86400 ;
              var hours = parseInt(remain / 3600);
@@ -1004,7 +1020,7 @@ export default {
             }
              
       }
-    }
+    // }
 }
 
 // 获取主表字段，排除子表标识

src/views/activiti/todoManage.vue

@@ -105,8 +105,8 @@
             </a-table-column>
             <a-table-column title="操作" dataIndex="" align="center">
               <template slot-scope="t, r, i">
-                <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
-                <a-divider type="vertical" />
+                <!-- <a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
+                <a-divider type="vertical" /> -->
                 <a href="javascript:void(0);" @click="detail(r)">审批</a>
                 <a-divider type="vertical" />
                 <!--

src/views/system/modules/UserModal.vue

@@ -137,7 +137,8 @@
           <a-date-picker
             style="width: 100%"
             placeholder="请选择转正日期"
-            v-decorator="['nBecomeTime', { initialValue: !model.nBecomeTime ? null : moment(model.nBecomeTime, dateFormat) ,rules: [{ required: true, message: '请选择转正日期' }] }]"
+            disabled='true'
+            v-decorator="['nBecomeTime', { initialValue: !model.nBecomeTime ? null : moment(model.nBecomeTime, dateFormat)}]"
           />
         </a-form-item>