查询条件修改

src/HDrpManagement/orderManage/index.vue

@@ -95,13 +95,13 @@
                     @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
-<!--        <div class="mt-10" >
-          <p class="search__label">是否手工关闭:</p>
-          <el-select v-model="where.tobeclosebyhand" clearable style="margin-right:10px" size="small" placeholder="请选择关闭状态" @change="change">
+        <div class="mt-10" >
+          <p class="search__label">待手工关闭:</p>
+          <el-select v-model="where.tobeclosebyhand" clearable style="margin-right:10px" size="small" placeholder="请选择手工关闭状态" @change="change">
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
-        </div>-->
+        </div>
       </template>
       <template #custom-right>
         <el-button type="text" v-if="!more" @click="more = true">更多</el-button>

src/HDrpManagement/orderMx/index.vue

@@ -53,6 +53,23 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10 inline-16">
+          <label class="search__label" >查看未发:</label>
+          <el-select v-model="where.isuncheckout" placeholder="请选择" size="small" @change="selectChange">
+            <el-option
+                label="全部"
+                value="">
+            </el-option>
+            <el-option
+                label="是"
+                value="1">
+            </el-option>
+            <el-option
+                label="否"
+                value="0">
+            </el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select v-model="where.status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="selectChange">
@@ -111,7 +128,8 @@ export default {
         "invoicestatus":'',
         "isreturn": '',
         "ischange": '',
-        "isfreeze":''
+        "isfreeze":'',
+        "isuncheckout":''
       },
       dateSelect:[]
 
@@ -124,6 +142,7 @@ export default {
         this.$refs.basicLayout.param.content.where.begindate = this.dateSelect[0]
         this.$refs.basicLayout.param.content.where.enddate = this.dateSelect[1]
         this.$refs.basicLayout.param.content.where.isfreeze = this.where.isfreeze
+        this.$refs.basicLayout.param.content.where.isuncheckout = this.where.isuncheckout
         this.$refs.basicLayout.param.content.where.status = this.where.status
         this.$refs.basicLayout.param.content.where.agentinfo = this.where.agentinfo
         this.$refs.basicLayout.param.content.where.iteminfo = this.where.iteminfo

src/HDrpManagement/productStore/index.vue

@@ -118,18 +118,18 @@ export default {
       this.classOptions = res.data[0].ttemclass
     },
     onSubmit () {
-      let bool = false
+      let bool = true
       if (this.itemname == '' && this.itemclassids.length == 0 && this.iteminfo == '' && this.agentinfo == '' && this.isonsale == '' && this.isonsale !== 0 ) {
-        bool = true
+        bool = false
       }
       this.$refs['list'].param.content = {
-        "iteminfo":this.iteminfo,
-        "itemclassids":this.itemclassids.length == 0?[]:[this.itemclassids[this.itemclassids.length - 1]],
-        "agentinfo":this.agentinfo,
-        "pageSize":100,
-        "all":bool,
         "where":{
-          'isonsale':this.isonsale
+          'isonsale':this.isonsale,
+          "iteminfo":this.iteminfo,
+          "itemclassids":this.itemclassids.length == 0?[]:[this.itemclassids[this.itemclassids.length - 1]],
+          "agentinfo":this.agentinfo,
+          "pageSize":100,
+          "all":bool,
         }
       }
       this.$refs['list'].listData()
@@ -139,14 +139,16 @@ export default {
         "id":"20230408091703",
         "version":1,
         "content":{
-          "all":true,
-          "itemclassids":[],
-          "itemname":"",
-          "agentinfo":"",
-          "pageSize":100,
-          "where":{},
-          "itemno":"",
-          "isExport":1
+          "where":{
+            "all":true,
+            "itemclassids":[],
+            "itemname":"",
+            "agentinfo":"",
+            "pageSize":100,
+            "itemno":"",
+            "isExport":1
+          },
+
         }
       })
       window.open(res.data[0].url)