材料管理-合同管理模块/基本信息页面/供应商评价记录功能对接

src/assets/js/api/materialManagement.js

@@ -37,3 +37,28 @@ export const addGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/ad
 export const deletGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/delete', data);
 export const editGtMaterialVendorApi = data => post('/xmgl/gt/gtMaterialVendor/edit', data);
 export const gettGtMaterialVendorPageApi = data => get('/xmgl/gt/gtMaterialVendor/page', data);
+
+//合同管理_基本信息
+export const addGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/add', data);
+export const deletGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/delete', data);
+export const editGtMaterialContractApi = data => post('/xmgl/gt/gtMaterialContract/edit', data);
+export const gettGtMaterialContractPageApi = data => get('/xmgl/gt/gtMaterialContract/page', data);
+
+//合同管理_基本信息_付款记录
+export const addGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/add', data);
+export const deletGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/delete', data);
+export const editGtMaterialContractPaymentRecordApi = data => post('/xmgl/gt/gtMaterialContractPaymentRecord/edit', data);
+export const getGtMaterialContractPaymentRecordPageApi = data => get('/xmgl/gt/gtMaterialContractPaymentRecord/list', data);
+
+//合同管理_基本信息_到货验收
+export const addGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/add', data);
+export const deletGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/delete', data);
+export const editGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt/gtMaterialContractArrivalAcceptance/edit', data);
+export const gettGMaterialContractArrivalAcceptancePageApi = data => get('/xmgl/gt/gtMaterialContractArrivalAcceptance/list', data);
+
+
+//合同管理_供应商评价记录
+export const addGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/add', data);
+export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/delete', data);
+export const editGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/edit', data);
+export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/gt/gtMaterialSupplierEvaluationRecord/page', data);

src/views/projectFront/contractManagement/evaluationRecords.vue

@@ -10,7 +10,7 @@
       >
         <el-form-item label="供应商名称">
           <el-input
-            v-model="searchForm.warehouseName"
+            v-model="searchForm.vendorName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -28,32 +28,32 @@
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
         <el-table-column
-          prop="warehouseName"
+          prop="vendorName"
           label="供应商名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="warehousePos"
+          prop="contractName"
           align="center"
           label="合同名称"
         ></el-table-column>
         <el-table-column
-          prop="header"
+          prop="evaluateContent"
           align="center"
           label="评价内容"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationScore"
           align="center"
           label="评价得分"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationUnit"
           align="center"
           label="评价单位"
         ></el-table-column>
         <el-table-column
-          prop="headerPhone"
+          prop="evaluationDate"
           align="center"
           label="评价日期"
         ></el-table-column>
@@ -108,41 +108,41 @@
           label-width="120px"
           class="dialogFormBox"
         >
-          <el-form-item label="供应商名称" prop="warehouseName">
+          <el-form-item label="供应商名称" prop="vendorName">
             <el-input
-              v-model="addEditForm.warehouseName"
+              v-model="addEditForm.vendorName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="合同名称" prop="warehousePos">
+          <el-form-item label="合同名称" prop="contractName">
             <el-input
-              v-model="addEditForm.warehousePos"
+              v-model="addEditForm.contractName"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价内容" prop="header">
+          <el-form-item label="评价内容" prop="evaluateContent">
             <el-input
               type="textarea"
               :rows="2"
-              v-model="addEditForm.header"
+              v-model="addEditForm.evaluateContent"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价得分" prop="headerPhone">
+          <el-form-item label="评价得分" prop="evaluationScore">
             <el-input
-              v-model="addEditForm.headerPhone"
+              v-model="addEditForm.evaluationScore"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价单位" prop="remark">
+          <el-form-item label="评价单位" prop="evaluationUnit">
             <el-input
-              v-model="addEditForm.remark"
+              v-model="addEditForm.evaluationUnit"
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="评价日期" prop="remark">
+          <el-form-item label="评价日期" prop="evaluationDate">
             <el-date-picker
-              v-model="addEditForm.remark"
+              v-model="addEditForm.evaluationDate"
               type="date"
               placeholder="选择日期"
             >
@@ -172,11 +172,11 @@
 </template>
 <script>
 import {
-  addStuffWarehouseApi,
+  addGtMaterialSupplierEvaluationRecordApi,
-  deleteStuffWarehouseApi,
+  deletGtMaterialSupplierEvaluationRecordApi,
-  editStuffWarehouseApi,
+  editGtMaterialSupplierEvaluationRecordApi,
-  getStuffWarehousePageApi
+  gettGMaterialSupplierEvaluationRecordPageApi
-} from '@/assets/js/api/warehouseManagement.js'
+} from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
     this.getList()
@@ -192,79 +192,28 @@ export default {
       },
       List: [],
       addEditForm: {
-        warehouseName: '',//仓库名称
+        vendorName: "",
-        warehousePos: '',//warehousePos
+        contractName: "",
-        header: '',//负责人
+        evaluateContent: "",
-        headerPhone: '',//负责人电话
+        evaluationScore: "",
-        remark: '',//备注
+        evaluationUnit: "",
+        evaluationDate: "",
       },
       addEditRules: {
-        warehouseName: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        warehousePos: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        header: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-        headerPhone: [
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'blur'
-          },
-          {
-            required: true,
-            message: this.$t('message.carManage.required'),
-            trigger: 'change'
-          }
-        ],
-
       },
       searchForm: {
-        warehouseName: '',
+        vendorName: '',
-        warehouseNumber: '',
-        warehousePos: '',
       },
     }
   },
   methods: {
     //查询仓库数据
     getList() {
-      getStuffWarehousePageApi({
+      gettGMaterialSupplierEvaluationRecordPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        warehouseName: this.searchForm.warehouseName,
+        vendorName: this.searchForm.vendorName,
-        warehousePos: this.searchForm.warehousePos,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -289,16 +238,16 @@ export default {
       params.projectSn = this.$store.state.projectSn
       this.$refs.addEditForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增仓库') {
+          if (this.title == '新增评价') {
-            addStuffWarehouseApi(params).then((result) => {
+            addGtMaterialSupplierEvaluationRecordApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑仓库') {
+          } else if (this.title === '编辑评价') {
             console.log('编辑信息', this.addEditForm)
-            editStuffWarehouseApi(params).then((result) => {
+            editGtMaterialSupplierEvaluationRecordApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
@@ -318,7 +267,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+          deletGtMaterialSupplierEvaluationRecordApi({ id: obj.id }).then((res) => {
             if (res.success) {
               this.getList()
               this.$message({

src/views/projectFront/procurementManagement/biddingManagement.vue

@@ -434,16 +434,13 @@
           </el-table>
         </div>
 
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" style="margin-right: 48%">
           <el-button
-            class="cancleBtn"
+            type="primary"
+            icon="el-icon-circle-check"
             @click="addOrEditDialog = false"
-            icon="el-icon-circle-close"
             size="medium"
-            >{{ $t('message.deviceManage.cancel') }}
+            >确认
-          </el-button>
-          <el-button type="primary" icon="el-icon-circle-check" size="medium"
-            >{{ $t('message.deviceManage.save') }}
           </el-button>
         </div>
       </div>