原材料采购查询条件修改

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-<!--    ddddd-->
+    <!--    ddddd-->
     <!-- 上传表单-->
     <el-dialog
       :title="upload.title"
@@ -54,6 +54,7 @@
     </el-dialog>
     <!-- 查询表单-->
     <Queryfrom
+      v-if="QueryfromLoading"
       :form-vals="templateInfo.where"
       :statisticList="statisticList"
       :showCount="showCount"
@@ -382,13 +383,13 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="采购时间：" prop="procurementTime">
-                  <el-date-picker
-                    v-model="insertFormData.procurementTime"
-                    type="date"
-                    placeholder="选择采购时间">
-                  </el-date-picker>
+                <el-date-picker
+                  v-model="insertFormData.procurementTime"
+                  type="date"
+                  placeholder="选择采购时间"
+                >
+                </el-date-picker>
               </el-form-item>
-
             </el-col>
           </el-row>
           <el-row>
@@ -397,10 +398,10 @@
                 <el-date-picker
                   v-model="insertFormData.estimatedDeliveryTime"
                   type="date"
-                  placeholder="选择预计到货时间">
+                  placeholder="选择预计到货时间"
+                >
                 </el-date-picker>
               </el-form-item>
-
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
@@ -599,6 +600,7 @@ export default {
   components: { Queryfrom, Menu, DialogTemplate, FormList, BtnMenuList },
   data() {
     return {
+      QueryfromLoading: false,
       insertTable: [],
       labelPosition: "right",
       insertFromTitle: "",
@@ -753,6 +755,7 @@ export default {
   created() {
     // 得到当前展示的table的唯一标识
     this.tableKey = this.$route.query.tableKey;
+    this.getList(this.queryParams);
   },
   watch: {},
   computed: {
@@ -856,14 +859,17 @@ export default {
         materielSpecies: 1,
       }).then((res) => {
         this.materiels = res.data;
-        this.materiels.forEach(item=>{
-          item.materielName=item.materieEncoding+item.materieColorNumber+item.specificationModel;
-        })
+        this.materiels.forEach((item) => {
+          item.materielName =
+            item.materieEncoding +
+            item.materieColorNumber +
+            item.specificationModel;
+        });
       });
     },
     //供应商信息
     getListSupplier() {
-      getListSupplier({isEnablePaging:false}).then((res) => {
+      getListSupplier({ isEnablePaging: false }).then((res) => {
         this.suppliers = res.data;
       });
     },
@@ -962,11 +968,18 @@ export default {
       this.loading = true;
       // 序列化当前查询参数列表
       queryParams && (this.queryParams.queryMap = queryParams.queryMap);
+      if (typeof queryParams.queryMap.timehorizon != "undefined") {
+        // timehorizon 时间范围转换字符串回传后台
+        this.queryParams.queryMap.timehorizon = JSON.stringify(
+          Object.assign({}, queryParams.queryMap.timehorizon)
+        );
+      }
       // 获取当前表单结构信息
       dragTableInfo({ queryMap: { tableKey: this.tableKey } })
         .then((res) => {
           console.log(res);
           // 得到当前模版信息 --- sql columns queryWhere
+          this.QueryfromLoading = true; // 加载查询组件
           this.templateInfo = res.data.resultMap;
           this.styleList = res.data.resultMap.style?.map((item) => {
             item.styleField = camelCase(
@@ -993,7 +1006,6 @@ export default {
               '[{"fieldName":"purchase.data_approval_status","mark":"6","refValue":"0"}]',
             children: [],
           });
-          console.log(this.excuteBtnArr[0].children,"dddddddddddddddddd")
           this.topBtnArr = res.data.resultMap.button?.filter(
             (item) => item.btnGroupType == "top"
           );