Merge branch 'master' into dev0.3

src/components/byTable/index.vue

@@ -742,14 +742,13 @@ export default defineComponent({
   ul {
     position: absolute;
     left: 0;
-
     top: 32px;
     padding: 0;
     margin: 0;
     z-index: 100;
     display: none;
     white-space: nowrap;
-    min-width: 80px;
+    min-width: 100%;
     li {
       list-style: none;
       font-size: 12px;

src/components/process/PurchasePayment.vue

@@ -31,11 +31,11 @@
           />
         </div>
       </template>
-      <template #rate>
+      <template #taxRate>
         <div style="width: 100%">
           <el-input-number
             onmousewheel="return false;"
-            v-model="formData.data.rate"
+            v-model="formData.data.taxRate"
             placeholder="请输入税率"
             :min="0"
             :max="100"
@@ -186,7 +186,7 @@ let formData = reactive({
     fileList: [],
     advanceCode: "",
     type: "",
-    rate: undefined,
+    taxRate: undefined,
   },
 });
 const submit = ref(null);
@@ -287,18 +287,18 @@ const formConfig = computed(() => {
       style: "width: 100%",
       fn: (val) => {
         if (val == "1") {
-          formData.data.rate = 13;
+          formData.data.taxRate = 13;
         } else if (val == "2") {
-          formData.data.rate = 6;
+          formData.data.taxRate = 6;
         } else {
-          formData.data.rate = undefined;
+          formData.data.taxRate = undefined;
         }
       },
     },
     {
       type: "slot",
-      prop: "rate",
-      slotName: "rate",
+      prop: "taxRate",
+      slotName: "taxRate",
       label: "税率 (%)",
       itemWidth: 34,
       isShow:
@@ -395,7 +395,7 @@ const rules = ref({
     { required: true, message: "请选择预付款单号", trigger: "change" },
   ],
   type: [{ required: true, message: "请选择付款类型", trigger: "change" }],
-  rate: [{ required: true, message: "请输入税率", trigger: "blur" }],
+  taxRate: [{ required: true, message: "请输入税率", trigger: "blur" }],
   corporationId: [
     { required: true, message: "请选择归属公司", trigger: "change" },
   ],

src/views/index.vue

@@ -64,7 +64,11 @@
 						:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
 						>
 						<el-table-column prop="deptName" label="名称" />
-						<el-table-column prop="onLineTime" label="在线时长" />
+						<el-table-column prop="onLineTime" label="在线时长">
+							<template #default="scope">
+								{{ scope.row.onLineTime }}h
+							</template>
+						</el-table-column>
 					</el-table>
 				</div>
 			</div>
@@ -178,6 +182,10 @@ const getData = (() => {
 		pageSize:5,
 	}).then(res=>{
 		onLineInfoData.value = res.data.deptList
+		onLineInfoData.value.unshift({
+			deptName:'我的时长',
+			onLineTime:res.data.onLineTime
+		})
 		//递归将数据内的deptList 改成 children
 		const changeData = (data) => {
 			data.forEach(item => {
@@ -185,6 +193,16 @@ const getData = (() => {
 					item.children = item.deptList
 					changeData(item.deptList)
 				}
+				if(item.userList && item.userList.length > 0) {
+
+					item.children = item.children.concat(item.userList.map(item=> {
+						return {
+							...item,
+							deptName:item.userName,
+							onLineTime:item.onLineTime
+						}
+					}))
+				}
 			})
 		}
 		changeData(onLineInfoData.value)

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -27,7 +27,17 @@
     >
       <el-table v-loading="loading" :data="sourceList.data">
         <el-table-column label="合同编号">
-          <el-table-column label="" prop="contractCode" width="160" />
+          <el-table-column label="" prop="contractCode" width="160">
+            <template #default="{ row }">
+              <div style="width: 100%">
+                <a
+                  style="color: #409eff; cursor: pointer; word-break: break-all"
+                  @click="openDetails(row)"
+                  >{{ row.contractCode }}</a
+                >
+              </div>
+            </template>
+          </el-table-column>
         </el-table-column>
         <el-table-column label="客户名称">
           <el-table-column label="" prop="customerName" min-width="200" />
@@ -65,7 +75,8 @@
           <el-table-column label="" width="120">
             <template #default="{ row }">
               <div>
-                {{ row.currency }} {{ moneyFormat(row.purchaseAmount, 2) }}
+                <!-- {{ row.currency }} {{ moneyFormat(row.purchaseAmount, 2) }} -->
+                CNY {{ moneyFormat(row.purchaseAmount, 2) }}
               </div>
             </template>
           </el-table-column>
@@ -246,6 +257,14 @@
         >
       </template>
     </el-dialog>
+    <el-dialog
+      title="合同详情"
+      v-if="openDetailsDialog"
+      v-model="openDetailsDialog"
+      width="1100"
+    >
+      <ContractDetails :contractId="currentContractId"></ContractDetails>
+    </el-dialog>
   </div>
 </template>
 
@@ -255,6 +274,7 @@ import byTable from "@/components/byTable/index";
 import byForm from "@/components/byForm/index";
 import useUserStore from "@/store/modules/user";
 import { ElMessage } from "element-plus";
+import ContractDetails from "@/components/contractCom/contractDetails.vue";
 
 const { proxy } = getCurrentInstance();
 const accountCurrency = ref([]);
@@ -595,6 +615,12 @@ const clickCancelSettlement = (row) => {
       getList();
     });
 };
+const openDetailsDialog = ref(false);
+const currentContractId = ref("");
+const openDetails = (row) => {
+  currentContractId.value = row.contractId;
+  openDetailsDialog.value = true;
+};
 </script>
 
 <style lang="scss" scoped>