1.0.64 合同关联付款账户

src/api/oa/erp/contractInfo/types.ts

@@ -104,6 +104,11 @@ export interface ContractInfoVO {
    */
   ossId: string | number;
 
+  /**
+   * 付款账户ID
+   */
+  paymentAccountId?: string | number;
+
   /**
    * 付款方式
    */
@@ -292,6 +297,11 @@ export interface ContractInfoForm extends BaseEntity {
    */
   ossId?: string | number;
 
+  /**
+   * 付款账户ID
+   */
+  paymentAccountId?: string | number;
+
   /**
    * 付款方式
    */

src/views/oa/base/printTemplate/index.vue

@@ -294,7 +294,7 @@ const handleUpdate = async (row?: PrintTemplateVO) => {
 
 const updateTemplate = (row) => {
   const _templateId = row?.templateId || ids.value[0];
-  router.push({ path: '/template/templateUpdate', query: { templateId: _templateId } });
+  router.push({ path: '/template/templateUpdate', query: { templateId: _templateId, templateType: row.templateType } });
 };
 
 /** 提交按钮 */

src/views/oa/base/templateVariable/index.vue

@@ -62,8 +62,8 @@
             <dict-tag :options="template_type" :value="scope.row.templateType" />
           </template>
         </el-table-column>
-        <el-table-column label="数据表名" align="center" prop="dataSource" v-if="columns[5].visible" />
+        <el-table-column label="数据表名" align="center" prop="dataSource" width="180"  v-if="columns[5].visible" />
-        <el-table-column label="数据字段" align="center" prop="dataField" v-if="columns[6].visible" />
+        <el-table-column label="数据字段" align="center" prop="dataField" width="180"  v-if="columns[6].visible" />
         <el-table-column label="变量类型" align="center" prop="varType" v-if="columns[7].visible">
           <template #default="scope">
             <dict-tag :options="var_type" :value="scope.row.varType" />
@@ -192,7 +192,7 @@ const columns = ref<FieldOption[]>([
   { key: 8, label: `默认值`, visible: true },
   { key: 9, label: `排序号`, visible: true },
   { key: 10, label: `模板ID`, visible: false },
-  { key: 11, label: `备注`, visible: true },
+  { key: 11, label: `备注`, visible: false },
   { key: 12, label: `激活标识`, visible: false },
   { key: 13, label: `删除标志`, visible: false },
   { key: 14, label: `创建部门`, visible: false },

src/views/oa/erp/contractInfo/edit.vue

@@ -195,6 +195,23 @@
               <el-input v-model="form.capitalizedAmount" placeholder="请输入合同大写金额" />
             </el-form-item>
           </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="付款账户" prop="paymentAccountId">
+              <el-select v-model="form.paymentAccountId" placeholder="请选择付款账户" :disabled="isFormDisabled"
+                         clearable >
+                <el-option v-for="item in paymentAccountList" :key="item.paymentAccountId"
+                           :label="`${item.accountType || ''} - ${item.accountNumber || ''}`"
+                           :value="item.paymentAccountId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同总价" prop="totalPrice">
+              <el-input v-model="form.totalPrice" placeholder="根据合同物料自动计算" disabled>
+                <template #append>元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="附件" prop="ossId">
               <!--              <el-button type="primary" plain icon="Upload" @click="handleFile">上传合同附件</el-button>-->
@@ -209,13 +226,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-col :span="12">
-              <el-form-item label="合同总价" prop="totalPrice">
-                <el-input v-model="form.totalPrice" placeholder="根据合同物料自动计算" disabled>
-                  <template #append>元</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :disabled="isFormDisabled" />
             </el-form-item>
@@ -608,6 +618,7 @@ import { contractAddMaterialInfo } from '@/api/oa/base/materialInfo';
 import { MaterialInfoForm } from '@/api/oa/base/materialInfo/types';
 import { listPaymentStage } from '@/api/oa/base/paymentStage';
 import type { PaymentStageVO } from '@/api/oa/base/paymentStage/types';
+import { getCrmPaymentAccountList } from '@/api/oa/crm/paymentAccount';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -620,11 +631,12 @@ const {
   business_direction,
   contract_flag,
   contract_type,
+  account_type,
   contract_status,
   material_flag,
   contract_template_flag
 } = toRefs<any>(
-  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'contract_status', 'material_flag', 'contract_template_flag')
+  proxy?.useDict('contract_category', 'business_direction', 'contract_flag', 'contract_type', 'account_type', 'contract_status', 'material_flag', 'contract_template_flag')
 );
 
 const buttonLoading = ref(false);
@@ -714,6 +726,13 @@ const getPaymentStageListSelect = async () => {
   paymentStageList.value = res.rows || [];
 };
 
+/** 付款账户下拉列表 */
+const paymentAccountList = ref<any[]>([]);
+const getPaymentAccountListSelect = async () => {
+  const res = await getCrmPaymentAccountList({});
+  paymentAccountList.value = res.data || [];
+};
+
 // 合同物料对话框
 const materialDialog = reactive({
   visible: false,
@@ -882,6 +901,7 @@ const initFormData: ContractInfoFormEx = {
   flowStatus: undefined,
   templateId: undefined,
   ossId: undefined,
+  paymentAccountId: undefined,
   paymentMethod: undefined,
   signatureAppendix: undefined,
   taxRate: undefined,
@@ -1329,6 +1349,7 @@ const loadSelectOptions = () => {
   getDeptInfoListSelect();
   getCustomerInfoListSelect();
   getPrintTemplateListSelect();
+  getPaymentAccountListSelect();
   getUserInfoListSelect();
   getPaymentStageListSelect();
 };