Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS into test

bms-front/src/api/data/supplierType.js

@@ -1,47 +0,0 @@
-import request from '@/utils/request'
-
-export function listSupplierType(query) {
-  return request({
-    url: '/data/supplierType/list',
-    method: 'get',
-    params: query
-  })
-}
-
-export function getSupplierType(typeId) {
-  return request({
-    url: '/data/supplierType/' + typeId,
-    method: 'get'
-  })
-}
-
-export function addSupplierType(data) {
-  return request({
-    url: '/data/supplierType',
-    method: 'post',
-    data
-  })
-}
-
-export function updateSupplierType(data) {
-  return request({
-    url: '/data/supplierType',
-    method: 'put',
-    data
-  })
-}
-
-export function changeSupplierTypeStatus(data) {
-  return request({
-    url: '/data/supplierType/changeStatus',
-    method: 'put',
-    data
-  })
-}
-
-export function delSupplierType(typeIds) {
-  return request({
-    url: '/data/supplierType/' + typeIds,
-    method: 'delete'
-  })
-}

bms-front/src/views/customersuppliermanagement/supplierinfo/index.vue

@@ -166,9 +166,6 @@
       <el-table-column v-if="isColVisible('cooperationStartDate')" label="合作开始日期" align="center" prop="cooperationStartDate">
         <template #default="scope">{{ formatDateOnly(scope.row.cooperationStartDate) }}</template>
       </el-table-column>
-      <el-table-column v-if="isColVisible('contractStartDate')" label="合同开始时间" align="center" prop="contractStartDate" width="120">
-        <template #default="scope">{{ formatDateOnly(scope.row.contractStartDate) }}</template>
-      </el-table-column>
       <el-table-column v-if="isColVisible('contractEndDate')" label="合同结束时间" align="center" prop="contractEndDate" width="120">
         <template #default="scope">{{ formatDateOnly(scope.row.contractEndDate) }}</template>
       </el-table-column>
@@ -246,7 +243,6 @@ const columnDefs = [
   { key: 'weightThreshold', label: '重量阈值' },
   { key: 'throwRatio', label: '抛比' },
   { key: 'cooperationStartDate', label: '合作开始日期' },
-  { key: 'contractStartDate', label: '合同开始时间' },
   { key: 'contractEndDate', label: '合同结束时间' },
   { key: 'cooperationStatus', label: '合作状态' },
   { key: 'channelIds', label: '绑定渠道' },
@@ -320,7 +316,6 @@ const copyColumns = computed(() => [
   { key: 'weightThreshold', label: '重量阈值', get: r => (r.weightThreshold === null || r.weightThreshold === undefined ? '' : r.weightThreshold) },
   { key: 'throwRatio', label: '抛比', get: r => (r.throwRatio === null || r.throwRatio === undefined ? '' : r.throwRatio) },
   { key: 'cooperationStartDate', label: '合作开始日期', get: r => formatDateOnly(r.cooperationStartDate) },
-  { key: 'contractStartDate', label: '合同开始时间', get: r => formatDateOnly(r.contractStartDate) },
   { key: 'contractEndDate', label: '合同结束时间', get: r => formatDateOnly(r.contractEndDate) },
   { key: 'cooperationStatus', label: '合作状态', get: r => formatOption(cooperationStatusOptions.value, r.cooperationStatus) },
   { key: 'channelIds', label: '绑定渠道', get: r => channelNames(r.channelIds) },

bms-front/src/views/customersuppliermanagement/supplierinfo/supplieredit/index.vue

@@ -161,11 +161,6 @@
                   <el-date-picker v-model="form.cooperationStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择合作开始日期" style="width: 100%;" />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="合同开始时间" prop="contractStartDate">
-                  <el-date-picker v-model="form.contractStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择合同开始时间" style="width: 100%;" />
-                </el-form-item>
-              </el-col>
               <el-col :span="12">
                 <el-form-item label="合同结束时间" prop="contractEndDate">
                   <el-date-picker v-model="form.contractEndDate" type="date" value-format="YYYY-MM-DD" placeholder="选择合同结束时间" style="width: 100%;" />
@@ -695,7 +690,6 @@ function buildEmptyForm() {
     throwRatio: null,
     creditEd: null,
     cooperationStartDate: null,
-    contractStartDate: null,
     contractEndDate: null,
     cooperationStatus: null,
     channelIds: null,
@@ -1033,8 +1027,8 @@ function submitForm() {
       activeTab.value = 'base'
       return
     }
-    if (form.value.contractStartDate && form.value.contractEndDate && form.value.contractEndDate < form.value.contractStartDate) {
-      proxy.$modal.msgError('合同结束时间不能早于开始时间')
+    if (form.value.cooperationStartDate && form.value.contractEndDate && form.value.contractEndDate < form.value.cooperationStartDate) {
+      proxy.$modal.msgError('合同结束时间不能早于合作开始日期')
       activeTab.value = 'base'
       return
     }
@@ -1047,7 +1041,7 @@ function submitForm() {
       settlementUser: nullIfEmpty(form.value.settlementUser),
       serviceUserId: nullIfEmpty(form.value.serviceUserId),
       serviceUser: nullIfEmpty(form.value.serviceUser),
-      contractStartDate: nullIfEmpty(form.value.contractStartDate),
+      cooperationStartDate: nullIfEmpty(form.value.cooperationStartDate),
       contractEndDate: nullIfEmpty(form.value.contractEndDate)
     }
     saving.value = true