刀模据新增模糊查询

src/api/mes/md/unitmeasure.js

@@ -61,6 +61,7 @@ export function delUnitmeasure(measureId) {
 export function sapSynUnitmeasure() {
   return request({
     url: '/mes/md/unitmeasure/sapSynchro',
-    method: 'post'
+    method: 'post',
+    timeout: 40000
   })
 }

src/api/system/user.js

@@ -132,6 +132,7 @@ export function getBpmUser() {
   return request({
     url: '/system/usermanage/userManageCreate',
     method: 'post',
+    timeout: 40000
   })
 }
 

src/components/TmTool/index.vue

@@ -50,9 +50,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="型号" label-width="60px" prop="spec">
+      <el-form-item label="型号" label-width="60px" prop="specification">
         <el-input
-          v-model="queryParams.spec"
+          v-model="queryParams.specification"
           placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -114,7 +114,7 @@
         </template>
       </el-table-column>
       <el-table-column label="品牌" align="center" prop="brand" :show-overflow-tooltip="true"/>
-      <el-table-column label="型号" align="center" prop="spec" :show-overflow-tooltip="true"/>
+      <el-table-column label="型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
       <el-table-column label="类型" align="center" prop="toolTypeName" />
       <el-table-column label="库存数量" align="center" prop="quantity" />
       <el-table-column label="可用数量" align="center" prop="quantityAvail" />
@@ -170,6 +170,8 @@ export default {
         brandCode: null,
         brandName: null,
         toolId: null,
+        status: null,
+        specification: null,
       },
     };
   },
@@ -206,6 +208,7 @@ export default {
     handleQuery() {
       this.getList();
     },
+
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");

src/components/toolRequest/single.vue

@@ -26,7 +26,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="申请时间" prop="requestDate">
+          <!-- <el-form-item label="申请时间" prop="requestDate">
             <el-date-picker
               clearable
               v-model="queryParams.requestDate"
@@ -35,7 +35,11 @@
               placeholder="请选择申请时间"
             >
             </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="申请时间">
+        <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -166,6 +170,7 @@ export default {
       total: 0,
       //申请表格数据
       toolRequestList: [],
+      daterangePurchaseDate: [],
       // // 品牌名称
       // brandName: undefined,
       defaultProps: {
@@ -220,6 +225,11 @@ export default {
     /** 查询品牌列表 */
     getList() {
       this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
+        this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
+        this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
+      }
       listTmToolRequestUsed(this.queryParams).then((response) => {
         this.toolRequestList = response.rows;
         this.total = response.total;
@@ -232,6 +242,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangePurchaseDate=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/mes/tm/toolmachinesrecord/index.vue

@@ -34,29 +34,29 @@
           </el-form-item>
           <el-form-item label="工作单元名称" prop="workunitName">
             <el-input
-              v-model="queryParams.taskid"
+              v-model="queryParams.workunitName"
               placeholder="请输入工作单元名称"
               style="width:220px;"
               clearable
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="上机时间" prop="upDate">
+          <!-- <el-form-item label="上机时间" prop="upDate">
             <el-date-picker clearable
               v-model="queryParams.upDate"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="请选择上机时间">
             </el-date-picker>
-          </el-form-item>
-          <el-form-item label="下机时间" prop="downDate">
-            <el-date-picker clearable
-              v-model="queryParams.downDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="请选择下机时间">
-            </el-date-picker>
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="上机时间">
+        <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="下机时间">
+        <el-date-picker v-model="daterangePurchaseDate2" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -213,6 +213,9 @@ export default {
       total: 0,
       // 刀模版上下机记录表格数据
       recordList: [],
+
+      daterangePurchaseDate: [],
+      daterangePurchaseDate2: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -224,6 +227,7 @@ export default {
         taskCode: null,
         workunitId: null,
         workunitName: null,
+        workunitCode: null,
         type: null,
         typeStr: null,
         warehouseStr: null,
@@ -262,6 +266,15 @@ export default {
       this.loading = true;
       const params = Object.assign({}, this.queryParams)
       delete params.type
+      this.queryParams.params = {};
+      if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
+        this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
+        this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
+      }
+      if (null != this.daterangePurchaseDate2 && '' != this.daterangePurchaseDate2) {
+        this.queryParams.params["beginPurchaseDate2"] = this.daterangePurchaseDate2[0];
+        this.queryParams.params["endPurchaseDate2"] = this.daterangePurchaseDate2[1];
+      }
       listRecord(params).then(response => {
         this.recordList = response.rows;
         this.total = response.total;
@@ -295,6 +308,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangePurchaseDate=[];
+      this.daterangePurchaseDate2=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/mes/tm/toolrequest/index.vue

@@ -25,14 +25,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请时间" prop="requestDate">
-        <el-date-picker clearable
-          v-model="queryParams.requestDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请时间">
-        </el-date-picker>
+      <el-form-item label="申请时间">
+        <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
+      
       <!-- <el-form-item label="预计开始时间" prop="startTime">
         <el-date-picker clearable
           v-model="queryParams.startTime"
@@ -334,6 +331,8 @@ export default {
       total: 0,
       // 刀模版申请单表格数据
       tmToolRequestList: [],
+
+      daterangePurchaseDate: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -393,6 +392,11 @@ export default {
     /** 查询刀模版申请单列表 */
     getList() {
       this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
+        this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
+        this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
+      }
       listTmToolRequest(this.queryParams).then(response => {
         this.tmToolRequestList = response.rows;
         this.total = response.total;
@@ -449,6 +453,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangePurchaseDate=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/mes/tm/toolrequest/selectTask.vue

@@ -25,22 +25,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="生产工单" prop="workOrderCode">
-        <el-input
-          v-model="queryParams.workOrderCode"
-          placeholder="请输入生产工单"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="编排单号" prop="arrangeCode">
-        <el-input
-          v-model="queryParams.arrangeCode"
-          placeholder="请输入编排单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="statusArr">
         <el-select
           v-model="queryParams.statusArr"

src/views/mes/tm/toolrequestuse/index.vue

@@ -16,15 +16,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申请时间" prop="requestDate">
-        <el-date-picker
-          clearable
-          v-model="queryParams.requestDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择申请时间"
-        >
-        </el-date-picker>
+      <el-form-item label="申请时间">
+        <el-date-picker v-model="daterangePurchaseDate" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -367,6 +361,7 @@ export default {
       total: 0,
       // 刀模版领用单表格数据
       tmToolRequestUseList: [],
+      daterangePurchaseDate: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -405,6 +400,11 @@ export default {
     /** 查询刀模版领用单列表 */
     getList() {
       this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
+        this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
+        this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
+      }
       listTmToolRequestUse(this.queryParams).then((response) => {
         this.tmToolRequestUseList = response.rows;
         this.total = response.total;
@@ -439,6 +439,7 @@ export default {
         workunitName: null,
       };
       this.tmToolRequestList = [];
+
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -453,6 +454,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.daterangePurchaseDate=[];
+       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据