ly 1 سال پیش
والد
کامیت
78a069c784

+ 7 - 0
src/views/business/crm/order/form.vue

@@ -156,6 +156,13 @@
                 <span v-else>{{ form.boss }}</span>
                 <span v-else>{{ form.boss }}</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="乙方" prop="party">
+                <el-input v-if="editStatus" v-model="form.party" style="width: 100%; margin: 0; padding: 0"
+                  placeholder="请输入乙方名称" />
+                <span v-else>{{ form.party }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="14">
             <el-col :span="14">
               <el-form-item label="备注" prop="remark">
               <el-form-item label="备注" prop="remark">
                 <el-input v-if="editStatus" v-model="form.remark" show-word-limit maxlength="200"
                 <el-input v-if="editStatus" v-model="form.remark" show-word-limit maxlength="200"

+ 10 - 0
src/views/business/financial/collection/form.vue

@@ -223,6 +223,16 @@
                 <span>{{ form.applierName }}</span>
                 <span>{{ form.applierName }}</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="甲方:">
+                <span>{{ form.boss }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="乙方:">
+                <span>{{ form.party }}</span>
+              </el-form-item>
+            </el-col>
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div class="details-container">
         <div class="details-container">

+ 24 - 10
src/views/business/financial/collection/index.vue

@@ -20,28 +20,36 @@
       </el-dropdown>
       </el-dropdown>
     </div>
     </div>
     <!-- 搜索区 -->
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="68px">
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+        <el-input v-model="queryParams.companyName" size="small" style="width: 150px" placeholder="请输入客户名称" clearable
           @keyup.enter="handleQuery" />
           @keyup.enter="handleQuery" />
       </el-form-item>
       </el-form-item>
       <el-form-item label="合同编号:" prop="contractNo">
       <el-form-item label="合同编号:" prop="contractNo">
-        <el-input v-model="queryParams.contractNo" style="width: 150px" placeholder="请输入合同编号" clearable
+        <el-input v-model="queryParams.contractNo" size="small" style="width: 150px" placeholder="请输入合同编号" clearable
           @keyup.enter="handleQuery" />
           @keyup.enter="handleQuery" />
       </el-form-item>
       </el-form-item>
       <el-form-item label="收款账户:" prop="subsidiaryName">
       <el-form-item label="收款账户:" prop="subsidiaryName">
-        <el-input v-model="queryParams.subsidiaryName" style="width: 150px" placeholder="请输入收款账户" clearable
+        <el-input v-model="queryParams.subsidiaryName" size="small" style="width: 150px" placeholder="请输入收款账户" clearable
           @keyup.enter="handleQuery" />
           @keyup.enter="handleQuery" />
       </el-form-item>
       </el-form-item>
+
       <el-form-item prop="applierTime" label="审核时间:">
       <el-form-item prop="applierTime" label="审核时间:">
-        <el-date-picker v-model="queryParams.dateFilter" type="daterange" clearable format="YYYY - MM - DD "
+        <el-date-picker v-model="queryParams.dateFilter" size="small" type="daterange" clearable format="YYYY - MM - DD "
           value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
           value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
           style="width: 100%;"></el-date-picker>
           style="width: 100%;"></el-date-picker>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="甲方:" prop="boss">
+        <el-input v-model="queryParams.boss" size="small" style="width: 150px" placeholder="请输入甲方" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="乙方:" prop="party">
+        <el-input v-model="queryParams.party" size="small" style="width: 150px" placeholder="请输入乙方" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
       <el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
 
 
@@ -98,14 +106,20 @@
           <span v-else-if="scope.row.arriveStatus === 2" style="color: #cd853f">部分支付</span>
           <span v-else-if="scope.row.arriveStatus === 2" style="color: #cd853f">部分支付</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="收款账户" prop="subsidiaryName" align="center"/>
-       
+      <el-table-column label="收款账户" prop="subsidiaryName" align="center" />
+
       <el-table-column v-if="getShowStatus(14)" label="到账日期" prop="actuallyDate" align="center">
       <el-table-column v-if="getShowStatus(14)" label="到账日期" prop="actuallyDate" align="center">
         <template #default="scope">
         <template #default="scope">
           {{ (scope.row.arriveDate) }} {{scope.row.arriveTime}}
           {{ (scope.row.arriveDate) }} {{scope.row.arriveTime}}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column v-if="getShowStatus(13)" label="备注" prop="remark" align="center" min-width="100" />
       <el-table-column v-if="getShowStatus(13)" label="备注" prop="remark" align="center" min-width="100" />
+      <el-table-column label="甲方" width="80" align="center" prop="boss">
+
+      </el-table-column>
+      <el-table-column label="乙方" width="80" align="center"  prop="party">
+
+      </el-table-column>
       <el-table-column label="操作" width="80" align="center">
       <el-table-column label="操作" width="80" align="center">
         <template #default="scope">
         <template #default="scope">
           <el-button type="primary" size="small" link @click="handleView(scope.row.id)">查看</el-button>
           <el-button type="primary" size="small" link @click="handleView(scope.row.id)">查看</el-button>

+ 10 - 2
src/views/business/financial/payment/form.vue

@@ -166,8 +166,16 @@
                 <span>{{ form.verifyComment }}</span>
                 <span>{{ form.verifyComment }}</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
-
-
+            <el-col :span="6">
+              <el-form-item label="甲方:" required>
+                <span>{{ form.boss }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="乙方:" required>
+                <span>{{ form.party }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="备注:">
               <el-form-item label="备注:">
                 <el-input v-if="editStatus" v-model.trim="form.remark" size="small" type="text" placeholder="备注"
                 <el-input v-if="editStatus" v-model.trim="form.remark" size="small" type="text" placeholder="备注"

+ 11 - 0
src/views/business/financial/payment/index.vue

@@ -34,6 +34,15 @@
           value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
           value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
           style="width: 100%;"></el-date-picker>
           style="width: 100%;"></el-date-picker>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="甲方:" prop="boss">
+        <el-input v-model="queryParams.boss" style="width: 150px" placeholder="请输入甲方" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="乙方:" prop="party">
+        <el-input v-model="queryParams.party" style="width: 150px" placeholder="请输入乙方" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -92,6 +101,8 @@
 
 
       <el-table-column v-if="getShowStatus(13)" label="申请人" prop="applierName" min-width="130" align="center" />
       <el-table-column v-if="getShowStatus(13)" label="申请人" prop="applierName" min-width="130" align="center" />
       <el-table-column v-if="getShowStatus(14)" label="备注" prop="remark" align="center" />
       <el-table-column v-if="getShowStatus(14)" label="备注" prop="remark" align="center" />
+      <el-table-column  label="甲方" prop="boss"  align="center" />
+      <el-table-column  label="乙方" prop="party"  align="center" />
       <el-table-column label="操作" fixed="right" width="60" align="center">
       <el-table-column label="操作" fixed="right" width="60" align="center">
         <template #default="scope">
         <template #default="scope">
           <el-button link type="primary" size="small" @click="handleFormPageOpen(scope.row.id)">查看</el-button>
           <el-button link type="primary" size="small" @click="handleFormPageOpen(scope.row.id)">查看</el-button>