Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/Pricesystem/index.js

@@ -118,7 +118,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '200',
+    width: '300',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/views/Pricesystem/ListOfPriceSystems.vue

@@ -114,6 +114,7 @@
         label="生效时间"
         :rules="{ required: true, message: '请选择生效时间', trigger: ['change', 'blur'] }"
         prop="effectiveTime"
+     
       >
         <el-date-picker
           v-model="details.form.effectiveTime"
@@ -257,6 +258,7 @@ const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const dialogTemp = ref(false);
+const loadstate=ref(true);//tru新增
 const Historical = reactive({
   popUpShow: false, //历史版本弹窗
   data: [], //历史版本数据
@@ -652,6 +654,7 @@ const deletetails = row => {
 /** 设置客户 */
 const handleClient = async row => {
   try {
+    loadstate.value = false;
     details.loadingObj.pageLoading = true;
     let _data = {
       brandId: row.brandId,
@@ -696,6 +699,7 @@ const addition = async () => {
     });
     return;
   }
+  loadstate.value = true;
   console.log(details.selectionList, 'details.selectionList');
   let _row = details.selectionList[0];
   console.log(_row, '_row');