页面优化

src/views/device/deviceOrder/index.vue

@@ -44,7 +44,7 @@
         />
       </el-form-item>
       <el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"

src/views/device/spotInspectionOrder/index.vue

@@ -44,7 +44,7 @@
 				/>
 			</el-form-item>
 			<el-form-item label="工单状态" prop="orderStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"
@@ -318,6 +318,8 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
 			<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column width="150" label="计划编码" align="center" prop="planCode" />
 			<el-table-column width="150" label="计划名称" align="center" prop="planName" />
 			<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
@@ -359,8 +361,6 @@
 					<span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-			<el-table-column width="120" label="设备名称" align="center" prop="equipmentName" />
 			<el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>

src/views/device/upkeepOrder/index.vue

@@ -43,8 +43,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="planStatus">
-        <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
+      <el-form-item label="工单状态" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
             :key="dict.value"

src/views/system/datasource/authUser.vue

@@ -110,7 +110,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         datasourceId: undefined,
-        userName: undefined,
+        userName: null,
         phonenumber: undefined
       }
     };

src/views/wms/equipment/index.vue

@@ -1306,6 +1306,7 @@ export default {
             label: response.rows[i].materialCode + response.rows[i].materialDesc,
           });
         }
+        console.log(this.auxiliaryEquipmentRightList)
         for (let i in response.selected) {
           this.rightList.push(response.selected[i].key);
           this.form.rightData = this.rightList;
@@ -1460,6 +1461,7 @@ export default {
 
       this.queryAuxiliaryEquipmentParams.equipmentCategory = '0';
       listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
+        console.log("listEquipment")
         this.auxiliaryEquipmentLeftList = [];
         for (let i in response.rows) {
           // 将返回的列表赋值于穿梭框左边列表
@@ -1468,9 +1470,11 @@ export default {
             label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark,
           });
         }
+        console.log(this.auxiliaryEquipmentRightList)
       });
 
       getEquipment(equipmentId).then((response) => {
+        console.log("getEquipment")
         this.form = response.data;
         this.rightList = [];
         for (let i in response.data.selectedData) {
@@ -1478,12 +1482,14 @@ export default {
           this.rightList.push(response.data.selectedData[i].spareCode);
         }
         this.auxiliaryEquipmentRightList = [];
+        console.log(this.auxiliaryEquipmentRightList)
         for (let i in response.data.selectedEquipmentData) {
           // 将返回的辅助设备列表赋值于穿梭框右边列表
           this.auxiliaryEquipmentRightList.push(
             response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
           );
         }
+        console.log(this.auxiliaryEquipmentRightList)
 
         if (response.data.imageFiles != null) {
           var newFiles = [];