Merge branch 'yinet' of yinet2020/YinetOASystemWeb into master

src/views/system/actform/leave/leave.vue

@@ -37,7 +37,6 @@
               placeholder="请输入职务"
               size="small"
               clearable :style="{width: '100%'}"
-
             />
           </el-form-item>
         </el-col>
@@ -63,43 +62,7 @@
                       :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
           </el-form-item>
         </el-col>
-        <!--        <el-row :span="24">-->
-        <!--          <el-col :span="18">-->
-        <!--            <el-col :span="12">-->
-        <!--              <el-form-item label="请假开始时间" prop="daterange">-->
-        <!--                &lt;!&ndash;            <el-date-picker type="daterange" v-model="form.daterange" format="yyyy-MM-dd"&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            value-format="yyyy-MM-dd" :style="{width: '100%'}" start-placeholder="开始日期"&ndash;&gt;-->
-        <!--                &lt;!&ndash;                            end-placeholder="结束日期" range-separator="至" clearable></el-date-picker>&ndash;&gt;-->
-        <!--                <el-date-picker-->
-        <!--                  v-model="form.daterange"-->
-        <!--                  format="yyyy-MM-dd"-->
-        <!--                  value-format="yyyy-MM-dd"-->
-        <!--                  type="date"-->
-        <!--                  placeholder="选择日期">-->
-        <!--                </el-date-picker>-->
-        <!--              </el-form-item>-->
-        <!--            </el-col>-->
-        <!--            <el-col :span="12">-->
-        <!--              <el-form-item label="请假结束时间" prop="endTime">-->
-        <!--                <el-date-picker-->
-        <!--                  v-model="form.endTime"-->
-        <!--                  format="yyyy-MM-dd"-->
-        <!--                  value-format="yyyy-MM-dd"-->
-        <!--                  type="date"-->
-        <!--                  placeholder="选择日期">-->
-        <!--                </el-date-picker>-->
-        <!--              </el-form-item>-->
-        <!--            </el-col>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="6">-->
-        <!--            <el-form-item label="共" prop="statistics">-->
-        <!--              <el-input v-model="form.statistics" placeholder="" show-word-limit clearable-->
-        <!--                        :style="{width: '100%'}">-->
-        <!--                <template slot="append">天</template>-->
-        <!--              </el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
+
         <el-col :span="18">
           <el-form-item label="日期范围" prop="daterange">
             <el-date-picker type="daterange" v-model="form.daterange" format="yyyy-MM-dd"
@@ -116,18 +79,14 @@
           </el-form-item>
         </el-col>
 
-        <!--        <el-col :span="24">-->
-        <!--          <p style="padding-left: 100px;color:#ff4949;">-->
-        <!--            1.请假半天可以写0.5不能写0.1,0.2等小数。2.全天假以00:00:00开始以23:59:59结束,下午请假以12:00:00开始</p>-->
-        <!--        </el-col>-->
         <el-col :span="12">
-          <el-form-item label="休息期间联系方式" prop="phone">
+          <el-form-item label="联系方式" prop="phone">
             <el-input v-model="form.phone" placeholder="请输入休息期间联系方式" clearable
                       :style="{width: '100%'}"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="休息期间应急工作委托人" prop="consignor">
+          <el-form-item label="工作委托人" prop="consignor">
             <!--            <el-input v-model="form.consignor" placeholder="请输入休息期间应急工作委托人" clearable-->
             <!--                      :style="{width: '100%'}"></el-input>-->
             <el-input v-model="form.consignor" placeholder="请选择休息期间应急工作委托人" clearable="true" :disabled="true">
@@ -141,50 +100,24 @@
                 </el-button>
               </template>
             </el-input>
-            <!--            <el-input v-model="formData.RecvAccount" v-show="false"/>-->
+
           </el-form-item>
         </el-col>
 
-        <!--        <el-col :span="12">-->
-        <!--          <el-form-item label="部门主管（经理）意见" prop="field114">-->
-        <!--            <el-input v-model="formData.field114" type="textarea" placeholder="请输入部门主管（经理）意见"-->
-        <!--                      :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
-        <!--        <el-col :span="12">-->
-        <!--          <el-form-item label="人力资源部（行政办）意见" prop="field115">-->
-        <!--            <el-input v-model="formData.field115" type="textarea" placeholder="请输入人力资源部（行政办）意见"-->
-        <!--                      :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
-        <!--        <el-col :span="12">-->
-        <!--          <el-form-item label="总经理意见" prop="field116">-->
-        <!--            <el-input v-model="formData.field116" type="textarea" placeholder="请输入总经理意见"-->
-        <!--                      :autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>-->
-        <!--          </el-form-item>-->
-        <!--        </el-col>-->
-        <!--        <el-col :span="12">-->
-        <!--          <p>-->
-        <!--            说明: 1.返回公司报到时间为销假时间。 2.所有员工3天及以上请假需总经理批准。 3.本表存人力资源部(行政办)备案。"-->
-        <!--          </p>-->
-        <!--        </el-col>-->
         <el-col :span="24" align="center">
           <el-form-item size="large" v-show="open3">
             <el-button type="primary" @click="submitForm" style="margin-left: -100px;">提交</el-button>
             <el-button @click="resetForm">重置</el-button>
           </el-form-item>
-          <el-form-item size="large" v-show="open4">
+         <!-- <el-form-item size="large" v-show="open4">
             <el-button type="primary" @click="submitToDo()" >同意</el-button>
             <el-button type="primary" @click="deleteToDo()" >拒绝</el-button>
-          </el-form-item>
+          </el-form-item>-->
         </el-col>
 
       </el-form>
     </el-row>
 
-    <!--        <el-form-item label="actkey：" prop="mailTheme">-->
-    <!--          <el-input v-model="form.actkey" type="textarea" placeholder="" />-->
-    <!--        </el-form-item>-->
     <!-- 选择人员对话框 -->
     <select-user-by-dept ref="selectUserByDept" :title="title" :open="open"  @ok="selectOK"/>
 
@@ -235,7 +168,7 @@
           //   { required: true, message: "部门不能为空", trigger: "blur" }
           // ],
           positions: [
-            { required: true, message: "职物不能为空", trigger: "blur" }
+            { required: true, message: "职务不能为空", trigger: "blur" }
           ],
           options: [
             { required: true, message: "请假类别不能为空", trigger: "blur" }
@@ -278,18 +211,7 @@
       }
     },
     methods: {
-      //   GetNumberOfDays(date1,date2){//获得天数
-      //   //date1：开始日期，date2结束日期
-      //
-      //   var day = parseInt((a2-a1)/ (1000 * 60 * 60 * 24));//核心：时间戳相减，然后除以天数
-      //    // var a1="12-19-2018";
-      //     //var a2="2019/1/7";
-      //     var b=GetNumberOfDays(a1,a2)
-      //     console.log(b);
-      //     this.getDicts("options").then(response => {
-      //       this.options = response.data;
-      //     });
-      // },
+
       //获取详细信息
       getDetails(id){
         id=id.split(".")[1]
@@ -334,12 +256,12 @@
 
       },
 
-      /** ---------------收件人---------------*/
+
       /** 写信中的 选择人员 按钮弹窗操作 */
       handleSelect() {
         this.$refs.selectUserByDept.childOpen=true;
         this.open = true;
-        this.title = "选择收件人";
+        this.title = "选择工作委托人";
       },
       selectOK(zh, xm) {
         // this.receiverAccount = zh;
@@ -393,13 +315,12 @@
       submitForm() {
         this.$refs['form'].validate(valid => {
           if (valid) {
-
             this.form.daterange= JSON.stringify(this.time)
             console.log(  this.form.daterange)
             // TODO 提交表单
             addLeave(this.form).then(response => {
               if (response.code === 200) {
-                this.msgSuccess("新增成功");
+                this.msgSuccess("提交成功");
                 this.resetForm("form");
               }
             });

src/views/system/actwork/meapply.vue

@@ -234,13 +234,10 @@
         formdata.append('pProcessInstanceId', row)
         //进度查看
         recordImg(formdata).then(response => {
-
           this.picUrl = window.URL.createObjectURL(response)
-
         })
 
         examineHistory(row,businessKey).then(response => {
-
           this.historyExamine = response.rows;
           console.log(response.rows)
         })

vue.config.js

@@ -2,13 +2,6 @@
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
 
-module.exports = {
-  chainWebpack: config => {
-    config.resolve.alias
-      .set('~', path.join(__dirname,'./node_modules'))
-  }
-}
-
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
@@ -40,7 +33,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.88:8081`,
+        target: `http://192.168.1.5:8081`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
@@ -131,6 +124,5 @@ module.exports = {
             }
         }
       )
-
   }
 }