Pārlūkot izejas kodu

项目详情字段添加

songxy 8 mēneši atpakaļ
vecāks
revīzija
b39ce11af4

+ 10 - 0
client/src/interface/contract.ts

@@ -209,6 +209,16 @@ export interface Contract {
    * **/
   areaManager: string
 
+  /**
+   * 区域总监
+   */
+  areaDirectorId: string
+
+  /**
+   * 区域总监名称
+   */
+  areaDirector: string
+
   /**
    * 签订时间
    */

+ 13 - 1
client/src/views/OaSystem/projectCenter/projectDetail/components/xmht/index.vue

@@ -248,8 +248,20 @@
                   @node-click="xsryNodeClickHandler"
                 />
               </td>
-              <td class="th">签订方式:</td>
+              <td class="th">区域总监:</td>
               <td>
+                <span v-if="!editor">{{ mContractDetail['areaDirector'] }}</span>
+                <UserOrgTree
+                  v-else
+                  v-model="mContractDetail.areaDirectorId"
+                  placeholder="请选择区域总监"
+                  @node-click="xsryNodeClickHandler"
+                />
+              </td>
+            </tr>
+            <tr>
+              <td class="th">签订方式:</td>
+              <td colspan="3">
                 <span v-if="!editor && !mContractDetail.signWay"></span>
                 <el-select
                   v-else

+ 8 - 0
client/src/views/OaSystem/projectCenter/projectDetail/projectDetail.scss

@@ -192,6 +192,14 @@
               }
 
               &:nth-child(3) {
+                > .title {
+                  &::before {
+                    background-color: #05ce9e;
+                  }
+                }
+              }
+
+              &:nth-child(4) {
                 margin-right: 0px;
 
                 > .title {

+ 4 - 0
client/src/views/OaSystem/projectCenter/projectDetail/projectDetail.vue

@@ -136,6 +136,10 @@
               <span class="title">应收款(元):</span>
               <span class="value">{{ projectDetail?.['receivableAmount'] ?? '' }}</span>
             </p>
+            <p>
+              <span class="title">已回款(元):</span>
+              <span class="value">{{ projectDetail?.['returnAmount'] ?? '0' }}</span>
+            </p>
             <p>
               <span class="title">合同余额(元):</span>
               <span class="value">{{ projectDetail?.['contractBalance'] ?? '' }}</span>

+ 12 - 3
client/src/views/OaSystem/projectCenter/projectTrack/index.vue

@@ -152,7 +152,16 @@
               {{ formatDate(scope.row.latestModifyTime) }}
             </template>
           </el-table-column>
-
+          <el-table-column prop="xmjl" label="开关" width="100">
+            <template #default="scope">
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="0"
+                @change="switchChange(scope.row)"
+                :inactive-value="1"
+              />
+            </template>
+          </el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
               <div style="display: flex">
@@ -163,7 +172,7 @@
                 >
                   <span>编辑</span>
                 </div>
-                <dialog-confirm
+                <!-- <dialog-confirm
                   title="删除将无法恢复该条数据,确认删除吗?"
                   confirmButtonText="确定"
                   cancelButtonText="取消"
@@ -176,7 +185,7 @@
                       <span>删除</span>
                     </div>
                   </template>
-                </dialog-confirm>
+                </dialog-confirm> -->
               </div>
             </template>
           </el-table-column>