价格修改

src/api/financialsector/index.js

@@ -74,7 +74,7 @@ export const $_tempDelpriceTemplate = params => {
 
 export const $_getexport= params => {
   return request({
-    url: '/api/logpm-basicdata/basicdataPrice/export',
+    url: '/api/logpm-basicdata/basicdataPrice//export/v2',
     method: 'get',
     params,
     responseType: 'blob',

src/option/Pricesystem/index.js

@@ -91,17 +91,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  {
+  // {
-    prop: 'expiryTime',
+  //   prop: 'expiryTime',
-    label: '到期时间',
+  //   label: '到期时间',
-    type: 4,
+  //   type: 4,
-    values: '',
+  //   values: '',
-    width: '150',
+  //   width: '150',
-    checkarr: [],
+  //   checkarr: [],
-    fixed: false,
+  //   fixed: false,
-    sortable: true,
+  //   sortable: true,
-    head: false,
+  //   head: false,
-  },
+  // },
   {
     prop: 'templateName',
     label: '模板名称',
@@ -157,8 +157,8 @@ export const HistoricalList = [
     head: false,
   },
   {
-    prop: 'effectiveStatus',
+    prop: 'maintenanceStatus',
-    label: '状态',
+    label: '维护状态',
     type: 1,
     values: '',
     width: '80',
@@ -179,8 +179,8 @@ export const HistoricalList = [
     head: false,
   },
   {
-    prop: 'expiryTime',
+    prop: 'effectiveStatus',
-    label: '过期时间',
+    label: '生效状态',
     type: 1,
     values: '',
     width: '90',
@@ -189,6 +189,17 @@ export const HistoricalList = [
     sortable: true,
     head: false,
   },
+  // {
+  //   prop: 'expiryTime',
+  //   label: '过期时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '90',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
 
   {
     prop: 'createUserName',

src/views/Pricesystem/ListOfPriceSystems.vue

@@ -21,6 +21,9 @@
           <el-button type="primary" @click="ImportTemplate">
             <el-icon><Upload /></el-icon>导入价格</el-button
           >
+          <el-button type="primary" @click="updateImportTemplate">
+            <el-icon><Upload /></el-icon>更 新导入价格</el-button
+          >
           <el-button type="primary" @click="addition">
             <el-icon><Plus /></el-icon>新增</el-button
           >
@@ -116,16 +119,17 @@
         prop="effectiveTime"
      
       >
+      <!-- :disabled-date="time1" -->
         <el-date-picker
           v-model="details.form.effectiveTime"
           type="date"
           placeholder="请选择生效时间"
-          :disabled-date="time1"
+ 
           :shortcuts="shortcuts"
           value-format="YYYY-MM-DD"
         />
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="到期时间"
         :rules="{ required: true, message: '请选择到期时间', trigger: ['change', 'blur'] }"
         prop="expiryTime"
@@ -138,7 +142,7 @@
           :shortcuts="shortcuts"
           value-format="YYYY-MM-DD"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item
         label="价格体系模板"
         :rules="{ required: true, message: '请选择体系模板', trigger: ['change', 'blur'] }"
@@ -167,11 +171,11 @@
     </template>
   </el-dialog>
   <!-- 导入模板 -->
-  <el-dialog v-model="dialogTemp" title="导入模板" width="500">
+  <el-dialog v-model="dialogTemp" :title="uptitle" width="500">
     <el-upload
       class="upload-demo"
       drag
-      action="/api/logpm-basicdata/basicdataPrice/upload/v2"
+      :action="importaction"
       :headers="headers"
       :on-success="handleSuccess"
       :before-upload="beforeAvatarUpload"
@@ -190,6 +194,8 @@
       </div>
     </template>
   </el-dialog>
+
+
   <!-- 历史版本  -->
   <el-dialog v-model="Historical.popUpShow" title="历史版本">
     <tablecmt
@@ -259,6 +265,8 @@ const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const dialogTemp = ref(false);
 const loadstate=ref(true);//tru新增
+const importaction=ref('/api/logpm-basicdata/basicdataPrice/upload/v2')
+const uptitle=ref('导入模板')
 const Historical = reactive({
   popUpShow: false, //历史版本弹窗
   data: [], //历史版本数据
@@ -385,8 +393,15 @@ const exporTemp = () => {
 };
 // 导入模板
 const ImportTemplate = () => {
+  uptitle.value='导入模板'
+  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/v2'
   dialogTemp.value = true;
 };
+const updateImportTemplate=()=>{
+  uptitle.value='更新导入模板'
+  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/upload/v3'
+  dialogTemp.value = true;
+}
 /** 生效时间 -- 生效时间不能大于到期时间 */
 const time1 = time => {
   if (!details.form.expiryTime) return false;
@@ -505,7 +520,7 @@ const onLoad = async () => {
       ...details.page,
       ...details.query,
     };
-
+    details.loadingObj.list=true;
     const res = await getBasicdataPrice(submitData);
 
     const { code, data } = res.data;
@@ -751,6 +766,7 @@ const handleSubmitBasic = () => {
       }
 
       ElMessage.success(msg);
+      Historicalversion(HistoriBt.value)
       onLoad();
     } catch (error) {
       console.log('error :>> ', error);