页面问题修改

src/views/canteen/base/mobile/complaint/index.vue

@@ -174,7 +174,7 @@
           content:null, 
           canteenId:null, 
         },
-        dateRange:[],
+        dateRange:this.defaultDateRange(),
         pickerOptions: {
             shortcuts: [{
                 text: '最近一周',
@@ -249,7 +249,7 @@
         },
         /** 重置按钮操作 */
         resetQuery() { 
-            this.dateRange=[]
+            this.dateRange=this.defaultDateRange()
             this.queryParams = {
                 pageNum: 1,
                 pageSize: 10,
@@ -328,6 +328,15 @@
           this.dialogImageUrl = row.imgUrl;
           this.dialogVisible = true;
         },
+        defaultDateRange() {
+          const end = new Date(new Date().toLocaleDateString());
+          end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+          const start = new Date((new Date().toLocaleDateString()));
+          start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+          this.start = parseInt(start.getTime() / 1000)
+          this.end = parseInt(end.getTime() / 1000)
+          return [start, end]
+        }, 
         //日期
         formatDate(date) {
             // 格式化为 YYYY-MM-DD

src/views/foodManage/purchaseManage/contractList/edit.vue

@@ -399,12 +399,12 @@ export default {
         },
     },
     methods: {
-      // 公用方法
+        // 公用方法
         fetchUsers() {
             let param = {
                 pageNum:1,
                 pageSize: 1000,
-                roleId: 1
+                roleId: 3
             }
             fetchUsersApi(param).then((response) => {
             console.log(response);

src/views/foodManage/purchaseManage/goodsInquiry/edit.vue

@@ -405,7 +405,7 @@ export default {
         let param = {
             pageNum:1,
             pageSize: 1000,
-            roleId: 1
+            roleId: 3
         }
         fetchUsersApi(param).then((response) => {
              if (response.rows) {

src/views/foodManage/purchaseManage/goodsInquiry/index.vue

@@ -200,7 +200,7 @@ export default {
             },
             treeAreaOptions:[],//区域树
             wareHouseOptions:[],//仓库下拉选
-            dateRange:[],
+            dateRange:this.defaultDateRange(),
             pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -270,7 +270,7 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.dateRange = []
+            this.dateRange = this.defaultDateRange()
             this.queryParams = {
                 pageNum: 1,
                 pageSize: 10,
@@ -378,6 +378,15 @@ export default {
             const day = String(date.getDate()).padStart(2, '0');
             return `${year}-${month}-${day}`;
         },
+        defaultDateRange() {
+          const end = new Date(new Date().toLocaleDateString());
+          end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+          const start = new Date((new Date().toLocaleDateString()));
+          start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+          this.start = parseInt(start.getTime() / 1000)
+          this.end = parseInt(end.getTime() / 1000)
+          return [start, end]
+        }, 
         //日期时间
         formatDateTime(date) {
             // 格式化为 YYYY-MM-DD

src/views/foodManage/purchaseManage/purchaseInspection/edit.vue

@@ -416,7 +416,7 @@ export default {
             let param = {
                 pageNum:1,
                 pageSize: 1000,
-                roleId: 1
+                roleId: 3
             }
             fetchUsersApi(param).then((response) => {
                 console.log(response);

src/views/foodManage/stockManage/depotManage/index.vue

@@ -363,7 +363,7 @@ export default {
           let param = {
               pageNum:1,
               pageSize: 1000,
-              roleId: 1
+              roleId: 2
           }
         fetchUsersApi(param).then((response) => {
            console.log(response);

src/views/foodManage/supplierManage/supplierList/index.vue

@@ -138,13 +138,12 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="绑定供应商用户" prop="supplierUserId">
+                                <el-form-item label="供应商用户" prop="supplierUserId">
                                     <el-select v-model="form.supplierUserId"  placeholder="请选择绑定供应商用户" style="width: 100%;" clearable>
                                         <el-option v-for="item in supplierUserList"
-                                            :disabled="item.bingStatus"
+                                            :key="item.id"
-                                            :key="item.userId"
+                                            :label="item.name"
-                                            :label="item.userName"
+                                            :value="item.id"
-                                            :value="item.userId"
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
@@ -633,6 +632,7 @@ import { systemAreaTreeApi } from "@/api/base/stall";
 import { systemMaterialTreeApi } from "@/api/dish/material";
 import { imgUpLoadTwo } from '@/api/system/upload'
 import { listUserAll,supplierPageApi,addSupplierApi, editSupplierApi, removeSupplierApi, editStatusSupplierApi } from "@/api/foodManage/supplierManage";
+import { fetchUsersApi } from "@/api/foodManage/purchaseManage";
 export default {
     name: "",
     dicts: [],
@@ -780,13 +780,27 @@ export default {
         }
     },
     created() {
+          this.fetchUsers();
           this.getTypeTreeData();
           this.getTreeData();
           this.getList(); 
-          this.getSupplierUserList();
     },
 
     methods: {
+        // 供应商用户
+        fetchUsers() {
+            let param = {
+                pageNum:1,
+                pageSize: 1000,
+                roleId: 1
+            }
+            fetchUsersApi(param).then((response) => { 
+                if (response.rows) {
+                    // 从接口返回的数据中提取用户选项
+                    this.supplierUserList  = response.rows
+                }
+          });
+        },
         //类型树
         getTypeTreeData() {
             let param = {}
@@ -800,18 +814,6 @@ export default {
                 this.treeOptions = response.data;
             });
         }, 
-        getSupplierUserList(){
-            let param = {
-                pageNum:1,
-                pageSize:100,
-                deptId:225,
-                queryTyoe:2
-            }
-            listUserAll(param).then((response) => {
-                this.supplierUserList = response.rows;
-                // this.total = response.total
-            })
-        },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1;
@@ -920,7 +922,6 @@ export default {
         },
         // 表单重置
         reset() {
-            this.getSupplierUserList()
             this.activeName='baseInfo'
             this.fileList1=[]
             this.idCardImgZ=[]

src/views/ims/supplier_person/index.vue

@@ -267,7 +267,7 @@ export default {
     handleUpdate(row) {
       console.log("row", row);
       this.reset();
-      getListApi(row.id).then(response => {
+      getListApi({id:row.id}).then(response => {
         console.log("response",response);
         this.form = response.rows[0];
         if(response.rows[0].photoUrl){

src/views/kitchen/wasteManage/wasteDetails/index.vue

@@ -99,7 +99,7 @@ export default {
         pageSize: 10,
         mealtimeType: undefined
       },
-      dateRange:[],
+      dateRange:this.defaultDateRange(),
       pickerOptions: {
           shortcuts: [{
               text: '最近一周',
@@ -142,7 +142,7 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() { 
-          this.dateRange=[]
+          this.dateRange=this.defaultDateRange()
           this.queryParams = {
             pageNum: 1,
             pageSize: 10,
@@ -176,6 +176,15 @@ export default {
           this.dialogImageUrl = row.fileUrl;
           this.dialogVisible = true;
       },
+      defaultDateRange() {
+        const end = new Date(new Date().toLocaleDateString());
+        end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+        const start = new Date((new Date().toLocaleDateString()));
+        start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+        this.start = parseInt(start.getTime() / 1000)
+        this.end = parseInt(end.getTime() / 1000)
+        return [start, end]
+      }, 
       //日期
       formatDate(date) {
           // 格式化为 YYYY-MM-DD

src/views/kitchen/wasteManage/wasteGarbage/index.vue

@@ -278,7 +278,7 @@ export default {
         pageSize: 10,
         mealtimeType: undefined
       },
-      dateRange:[],
+      dateRange:this.defaultDateRange(),
       pickerOptions: {
           shortcuts: [{
               text: '最近一周',
@@ -391,7 +391,7 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() { 
-          this.dateRange=[]
+          this.dateRange=this.defaultDateRange()
           this.queryParams = {
             pageNum: 1,
             pageSize: 10,
@@ -563,6 +563,15 @@ export default {
         this.dialogImageUrl = item;
         this.dialogVisible = true;
       },
+      defaultDateRange() {
+        const end = new Date(new Date().toLocaleDateString());
+        end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+        const start = new Date((new Date().toLocaleDateString()));
+        start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+        this.start = parseInt(start.getTime() / 1000)
+        this.end = parseInt(end.getTime() / 1000)
+        return [start, end]
+      }, 
       //日期
       formatDate(date) {
           // 格式化为 YYYY-MM-DD

src/views/kitchen/wasteManage/wasteSummary/index.vue

@@ -127,7 +127,7 @@ export default {
         canteenName: undefined,
         areaNameStr: undefined, 
       },
-      dateRange:[],
+      dateRange:this.defaultDateRange(),
       pickerOptions: {
           shortcuts: [{
               text: '最近一周',
@@ -179,7 +179,7 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() { 
-          this.dateRange=[]
+          this.dateRange=this.defaultDateRange()
           this.queryParams = {
             pageNum: 1,
             pageSize: 10,
@@ -234,6 +234,15 @@ export default {
           this.dialogImageUrl = row.fileUrl;
           this.dialogVisible = true;
       },
+      defaultDateRange() {
+        const end = new Date(new Date().toLocaleDateString());
+        end.setTime(end.getTime() + 24 * 60 * 60 * 1000 -1);
+        const start = new Date((new Date().toLocaleDateString()));
+        start.setTime(start.getTime() - 30 * 24 * 60 * 60 * 1000); 
+        this.start = parseInt(start.getTime() / 1000)
+        this.end = parseInt(end.getTime() / 1000)
+        return [start, end]
+      }, 
       //日期
       formatDate(date) {
           // 格式化为 YYYY-MM-DD