1

src/components/process/EHSD/Contract.vue

@@ -123,6 +123,7 @@
                 v-model="formData.data.buyCorporationName"
                 disabled
                 v-else
+                style="width: 100%"
               >
               </el-select>
             </el-form-item>

src/components/process/EHSD/ContractChange.vue

@@ -123,6 +123,7 @@
                 v-model="formData.data.buyCorporationName"
                 disabled
                 v-else
+                style="width: 100%"
               >
               </el-select>
             </el-form-item>

src/components/process/EHSD/PriceSheet.vue

@@ -123,6 +123,7 @@
                 v-model="formData.data.buyCorporationName"
                 disabled
                 v-else
+                style="width: 100%"
               >
               </el-select>
             </el-form-item>

src/components/process/EHSD/Purchase.vue

@@ -115,6 +115,7 @@
                 v-model="formData.data.sellCorporationName"
                 disabled
                 v-else
+                style="width: 100%"
               >
               </el-select>
             </el-form-item>

src/components/process/EHSD/Sample.vue

@@ -123,6 +123,7 @@
                 v-model="formData.data.buyCorporationName"
                 disabled
                 v-else
+                style="width: 100%"
               >
               </el-select>
             </el-form-item>

src/components/process/SendFunds.vue

@@ -109,12 +109,19 @@
       <el-row :gutter="20">
         <el-col :span="6">
           <el-form-item label="用款时间" prop="paymentTime">
-            <el-date-picker
+            <!-- <el-date-picker
               v-model="formData.data.paymentTime"
               type="datetime"
               placeholder="请选择"
               value-format="YYYY-MM-DD HH:mm:ss"
               style="width: 100%"
+            /> -->
+            <el-date-picker
+              v-model="formData.data.paymentTime"
+              type="date"
+              placeholder="请选择"
+              value-format="YYYY-MM-DD"
+              style="width: 100%"
             />
           </el-form-item>
         </el-col>

src/views/EHSD/procurement/handoverSlipSampleEHSD/index.vue

@@ -31,6 +31,11 @@
             <span>{{ getTimeSpent(item) }}</span>
           </div>
         </template>
+        <template #status="{ item }">
+          <div style="width: 100%">
+            <span>{{ getStatus(item) }}</span>
+          </div>
+        </template>
       </byTable>
     </div>
 
@@ -153,8 +158,8 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "单位",
-        prop: "productUnit",
+        label: "样品单数量",
+        prop: "quantity",
         width: 140,
       },
     },
@@ -167,6 +172,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "采购状态",
+        slot: "status",
+        width: 100,
+      },
+    },
+    {
+      attrs: {
         label: "已耗时",
         slot: "timeSpent",
         width: 120,
@@ -367,6 +379,20 @@ const getTimeSpent = (item) => {
   }
   return text;
 };
+
+const getStatus = (row) => {
+  let str = "";
+  if (row.quantity !== "" && row.expendQuantity !== "") {
+    if (Number(row.quantity) === Number(row.expendQuantity)) {
+      str = "未采购";
+    } else if (Number(row.expendQuantity) === 0) {
+      str = "已采购";
+    } else {
+      str = "部分采购";
+    }
+  }
+  return str;
+};
 </script>
 
 <style lang="scss" scoped>

src/views/customer/highseas/index.vue

@@ -1195,7 +1195,7 @@ getDict();
 getList();
 const handleClickName = (row) => {
   proxy.$router.push({
-    path: "/ERP/customer/portrait",
+    path: "Portrait",
     query: {
       id: row.id,
     },

src/views/customer/portrait/com/CustomerInfo.vue

@@ -107,7 +107,7 @@
             detailsData.customerUserList.length > 1
           "
         >
-          <el-button type="primary" link size="small">更多联系人</el-button>
+          <!-- <el-button type="primary" link size="small">更多联系人</el-button> -->
         </div>
       </div>
     </div>

src/views/customer/portrait/index.vue

@@ -7,7 +7,10 @@
             <TitleInfo :content="titleList[0]"></TitleInfo>
           </div>
           <div>
-            <CustomerInfo :customerId="customerId" :key="customerId"></CustomerInfo>
+            <CustomerInfo
+              :customerId="customerId"
+              :key="customerId"
+            ></CustomerInfo>
           </div>
         </div>
       </div>
@@ -17,7 +20,10 @@
             <TitleInfo :content="titleList[1]"></TitleInfo>
           </div>
           <div class="content-box">
-            <LatestProgress :customerId="customerId" :key="customerId"></LatestProgress>
+            <LatestProgress
+              :customerId="customerId"
+              :key="customerId"
+            ></LatestProgress>
           </div>
         </div>
       </div>
@@ -29,7 +35,10 @@
             <TitleInfo :content="titleList[2]"></TitleInfo>
           </div>
           <div class="content-box">
-            <SaleStatistics :customerId="customerId" :key="customerId"></SaleStatistics>
+            <SaleStatistics
+              :customerId="customerId"
+              :key="customerId"
+            ></SaleStatistics>
           </div>
         </div>
       </div>
@@ -49,7 +58,10 @@
             <TitleInfo :content="titleList[4]"></TitleInfo>
           </div>
           <div class="content-box">
-            <SalesDetails :customerId="customerId" :key="customerId"></SalesDetails>
+            <SalesDetails
+              :customerId="customerId"
+              :key="customerId"
+            ></SalesDetails>
           </div>
         </div>
       </div>
@@ -88,6 +100,7 @@ onMounted(() => {
       margin-bottom: 10px;
       min-height: 300px;
       box-sizing: border-box;
+      overflow: auto;
     }
     .bottom {
       flex: 1;

src/views/customer/privatesea/index.vue

@@ -1198,7 +1198,7 @@ getDict();
 getList();
 const handleClickName = (row) => {
   proxy.$router.push({
-    path: "/ERP/customer/portrait",
+    path: "Portrait",
     query: {
       id: row.id,
     },

src/views/finance/fundManage/fundsStatement/index.vue

@@ -2,7 +2,7 @@
   <div class="fundsStatement">
     <el-form :inline="true" :model="req" class="demo-form-inline">
       <el-form-item label="资金账户">
-        <el-select v-model="req.managementId" placeholder="请输入">
+        <el-select v-model="req.managementId" placeholder="请输入" clearable>
           <el-option label="全部" value=""></el-option>
           <el-option
             :label="i.alias"