Merge branch 'main' of https://gitlab.com/seasoul1/middle-admin-ant

# Conflicts:
#	src/router/Middle/ProvideLoanApply/router.map.js

src/application/mk/basic-pages/list.vue

@@ -528,11 +528,8 @@ export default {
 }
 
 .gridPanel {
-  height: calc(100vh - 300px);
+  height: calc(100vh - 220px);
-}
+} 
-</style>
-
-<style>
 .oplinks svg {
   width: 22px;
   height: 22px;

src/pages/Middle/Mes/MesMaterials/MesMaterials/Edit.vue

@@ -650,6 +650,16 @@ export default {
 
         })
 
+        delete postdata.create_time
+        delete postdata.create_uid
+        delete postdata.update_time
+        delete postdata.update_uid
+        delete postdata.custom_attribute_attribute
+        delete postdata.custom_attribute_category
+        delete postdata.custom_attribute_field 
+        delete postdata.mes_materials_sort
+
+        
         console.log(postdata)
         // 格式化提交的数据
         this.$mk.formatFormData({ data: postdata, rules: this.options.formOptions.items });

src/pages/Middle/Mes/MesProductionOrder/MesProductionOrder/voucher.vue

@@ -498,8 +498,9 @@ export default {
             if (!this.dataId) {
               this.dataId = a.data.id;
 
-              this.pageInit();
             }
+            
+            this.pageInit();
           } else {
             this.$mk.error(a.msg || "保存失败"); // 显示错误信息
           }
@@ -676,38 +677,7 @@ export default {
           width: width * 0.9,
           height: height * 0.9,
           callback: ({ data }) => {
-            if (data.list && data.details && data.details.length) {
+               console.log(data)
-              this.formOptions.data = this.getDefaultData();
-              this.formOptions.data.AAPartner = data.list[0].AAPartner;
-              this.formOptions.data.WorkingProcedure = data.list[0].WorkingProcedure;
-
-
-              var rows = [];
-              data.details.forEach(item => {
-                var row = {
-                  AAProduct: item.AAInventory,
-                  AAProductID: item.AAInventoryID
-                };
-                row.ProductCode = item.AAInventoryCode;
-                row.specification = item.specification;
-                row.UnitName = item.ProductionUnitTitle;
-                if (this.firstQuantityFieldName) {
-                  row[this.firstQuantityFieldName] = (item.Quantity || 0) - (item.QuantityReceived || 0);
-                }
-                row.SourceTableName = "TP_outSourceOrder";
-                row.SourceTableID = item.OutSourceOrderID;
-                rows.push(row);
-              });
-              for (let i = rows.length; i < 10; i++) {
-                rows.push({});
-              }
-              console.log(rows)
-              this.detailsData = rows;
-
-              this.updateCurrentQuantity();
-            } else {
-              this.$mk.error("未选择任何数据");
-            }
           }
         })
       }

src/pages/Middle/ProvideLoanApply/ProvideLoanApply/ProvideLoanApply/List.vue

@@ -51,6 +51,17 @@ export default {
         start_time: 0, // 开始时间
         end_time: 0, // 结束时间
 
+        exportFileTitle: "车贷客户信息列表",
+        enabledExport: true,
+        enabledImport: false,
+        enabledImportTemplate: false,
+        exportColumns: [ 
+          { title: '姓名', field: "name" },
+          { title: '手机号', field: "phone" },
+          { title: '车型', field: "car_type" },
+          { title: '城市', field: "work_city" }
+        ],
+
 
         //搜索区
         searchFormData: {
@@ -63,8 +74,8 @@ export default {
         ],
         //搜索区
         searchFormItems: [ // 子项
-          { field: 'name', title: '姓名', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入姓名' } } },
+          { field: 'name', title: '姓名', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入姓名' } } },
-       
+          { span: 6, slots: { default: 'date' } },
           {
             align: 'right', span: 4, itemRender: {  // 按钮列
               name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
@@ -84,9 +95,9 @@ export default {
             { type: 'checkbox', width: 50 }, // 多选框  
             { title: '操作', slots: { default: 'op' }, width: 120 },
 
-            { field: 'name', sortable: true, title: '姓名', width: 250 },  
+            { field: 'name', sortable: true, title: '姓名', width: 130 },  
-            { field: 'phone', sortable: true, title: '手机号', width: 250 },  
+            { field: 'phone', sortable: true, title: '手机号', width: 130 },  
-            { field: 'car_type', sortable: true, title: '车型', width: 250 },  
+            { field: 'car_type', sortable: true, title: '车型', width: 100 },  
             { field: 'work_city', sortable: true, title: '城市', width: 250 },   
 
 
@@ -110,4 +121,7 @@ export default {
   }
 };
 
-</script> 
+</script> 
+<style scoped lang="less">
+ 
+</style>