2022.4.26

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe674;</span>
+                <div class="name">关联</div>
+                <div class="code-name">&amp;#xe674;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe70a;</span>
                 <div class="name">users</div>
@@ -456,9 +462,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1650606506390') format('woff2'),
-       url('iconfont.woff?t=1650606506390') format('woff'),
-       url('iconfont.ttf?t=1650606506390') format('truetype');
+  src: url('iconfont.woff2?t=1650935737210') format('woff2'),
+       url('iconfont.woff?t=1650935737210') format('woff'),
+       url('iconfont.ttf?t=1650935737210') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -484,6 +490,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont firerock-iconguanlian"></span>
+            <div class="name">
+              关联
+            </div>
+            <div class="code-name">.firerock-iconguanlian
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont firerock-iconusers"></span>
             <div class="name">
@@ -1087,6 +1102,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#firerock-iconguanlian"></use>
+                </svg>
+                <div class="name">关联</div>
+                <div class="code-name">#firerock-iconguanlian</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#firerock-iconusers"></use>

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2390497 */
-  src: url('iconfont.woff2?t=1650606506390') format('woff2'),
-       url('iconfont.woff?t=1650606506390') format('woff'),
-       url('iconfont.ttf?t=1650606506390') format('truetype');
+  src: url('iconfont.woff2?t=1650935737210') format('woff2'),
+       url('iconfont.woff?t=1650935737210') format('woff'),
+       url('iconfont.ttf?t=1650935737210') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.firerock-iconguanlian:before {
+  content: "\e674";
+}
+
 .firerock-iconusers:before {
   content: "\e70a";
 }

fhKeeper/formulahousekeeper/timesheet/src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "firerock-icon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "5651484",
+      "name": "关联",
+      "font_class": "guanlian",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
     {
       "icon_id": "14949575",
       "name": "users",

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -192,6 +192,7 @@
                     <el-table-column prop="ownerName" label="出差人员" width="100" fixed="left" align="center"></el-table-column>
                     <el-table-column prop="reason" label="出差事由" width="150" header-align="center"></el-table-column>
                     <el-table-column prop="projectName" label="投入项目" width="150" align="center"></el-table-column>
+                    <el-table-column prop="degreeName" :label="wuduData.customDegreeName" width="150" align="center"></el-table-column>
                     <el-table-column label="交通工具" width="120" align="center">
                         <template slot-scope="scope">
                             <span v-if="scope.row.way == 0">飞机</span>
@@ -241,7 +242,7 @@
                     </el-table-column>
                     <el-table-column v-if="isDingding" label="操作" width="90" fixed="right">
                         <template slot-scope="scope">
-                            <el-button icon="el-icon-edit" circle size="mini" @click="DingdingEditor(scope.row)"></el-button>
+                            <el-button icon="iconfont firerock-iconguanlian" circle size="mini" @click="DingdingEditor(scope.row)"></el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -973,6 +974,7 @@ export default {
                     this.tableList = res.data.records
                     this.total = res.data.total
                     this.loading = false
+                    console.log('tablelist',this.tableList);
                     this.$forceUpdate()
                 } else {
                     this.loading = false

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -472,10 +472,11 @@
                         </el-form-item>
                         <!--项目管理专业版模式下，项目下的近期执行的任务 -->
                         <el-form-item label="相关任务" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
-                            <el-select v-model="domain.taskId" placeholder="请选择" style="width:100%;" filterable="true" 
+                            <el-select v-model="domain.taskId" placeholder="请选择" style="width:75%;margin-right:7%" filterable="true" 
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                 <el-option v-for="item in domain.taskList" :key="item.taskId" :label="item.taskName" :value="item.taskId"></el-option>
                             </el-select>
+                            <el-checkbox v-model="domain.taskFinish" v-if="domain.taskId != undefined">已完成</el-checkbox>
                         </el-form-item>
                         <div v-for="(timeItem,tIndex) in domain.worktimeList" :key="tIndex" 
                             style="border: 0.5px #ddd solid;padding:5px;margin-bottom:15px;position:relative;">
@@ -4240,6 +4241,12 @@
                             } else {
                                 formData.append("taskId", 0);
                             }
+
+                            if (this.workForm.domains[i].taskFinish == true) {
+                                formData.append("taskFinish", 1);
+                            } else {
+                                formData.append("taskFinish", 0);
+                            }
                             
                             formData.append("reportTimeType", this.reportTimeType.type);
                             if (this.reportTimeType.type == 0) {

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -90,7 +90,13 @@
                     </template>
                     </van-field>
                     <van-field v-if="user.company.packageProject == 1"  readonly name="taskId" :value="item.taskName" label="关联任务" placeholder="请选择关联任务" @click="clickPickerTask(index)"
-                    />
+                    ></van-field>
+                    <van-field name="taskFinish" label="是否已完成" v-if="item.taskId != null">
+                        <template #input>
+                            <van-checkbox v-model="item.taskFinish" shape="square">已完成</van-checkbox>
+                        </template>
+                        
+                    </van-field>
                     <van-popup v-model="item.showPickerTask" position="bottom">
                         <van-picker show-toolbar :columns="item.taskList" value-key="taskName" @confirm="choseTask" @cancel="item.showPickerTask = false;$forceUpdate()" />
                     </van-popup>
@@ -986,6 +992,7 @@
             //选择任务
             clickPickerTask(i) {
                 if (!this.canEdit) return;
+                console.log(i);
                 this.clickIndex = i;
                 // var proId = this.form.domains[this.clickIndex].projectId
                 // this.getTaskList(proId)
@@ -1292,6 +1299,11 @@
                     } else {
                         formData.append("taskId", 0);
                     }
+                    if (this.form.domains[i].taskFinish == true) {
+                        formData.append("taskFinish", 1);
+                    } else {
+                        formData.append("taskFinish", 0);
+                    }
                     formData.append("createDate", this.form.createDate);
                     formData.append("isOvertime", this.form.domains[i].isOvertime?1:0);
                     if (this.form.domains[i].overtimeHours && this.form.domains[i].isOvertime == 1) {