Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/dashboard/LineChart.vue

@@ -108,6 +108,7 @@
           series:seriesDatas,
           toolbox:{
             show: true,
+            bottom:'-2%',
             feature: {
               dataZoom: {
                 yAxisIndex: 'none'

src/views/device/faultReport/index.vue

@@ -965,16 +965,25 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
+          <el-col :span="8">
-        <el-row>
             <el-form-item label="故障描述" prop="orderDesc">
-            <el-input
+                  <el-select
                     v-model="form.orderDesc"
-              placeholder="请输入故障描述"
+                     @change="$forceUpdate()"
-              type="textarea"
+                      clearable
-              :autosize="{ minRows: 2, maxRows: 4 }"
+                      filterable
-            />
+                      style="width: 200px"
+                      @keyup.enter.native="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in orderDescOption"
+                      :key="item.faultCode"
+                      :label="item.faultSubclass"
+                      :value="item.faultSubclass"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -1122,6 +1131,7 @@ import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
 import { getMaintenanceTeamList } from "@/api/device/equTeam";
+import { listFaultDescription } from "@/api/device/faultDescription";
 
 export default {
   name: "FaultReport",
@@ -1144,6 +1154,12 @@ export default {
         "text-align": "center",
         width: "120px",
       },
+      auxiliaryQueryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+      },
+      //故障描述
+      orderDescOption : [],
       teamOption: [],
       //图片存储
       fileList: [],
@@ -1282,6 +1298,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getOrderDesc();
   },
   methods: {
     // 生成表头序号
@@ -1316,6 +1333,13 @@ export default {
       console.log(nowDate(time));
       this.form.workPlanTime = nowDate(time);
     },
+    /** 查询维修措施列表 */
+    getOrderDesc() {
+      this.loading = true;
+      listFaultDescription(this.auxiliaryQueryParams).then((response) => {
+        this.orderDescOption = response.rows;
+      });
+    },
     //设备选择
     handleSelectEquipment() {
       this.$refs.itemSelect.showFlag = true;

src/views/device/repairOrder/index.vue

@@ -989,7 +989,7 @@
                   <el-input
                     v-model="form.workPerson"
                     placeholder="请选择维修人"
-                    style="width: 195px"
+                    style="width: 250px"
                   >
                     <el-button
                       slot="append"
@@ -1009,7 +1009,7 @@
                   <el-select
                     v-model="form.workStatus"
                     placeholder="请选择维修状态"
-                    style="width: 195px"
+                    style="width: 250px"
                   >
                     <el-option
                       v-for="dict in dict.type.device_repair_status"
@@ -1026,7 +1026,7 @@
                     :min="0"
                     :step="1"
                     v-model="form.workCost"
-                    style="width: 175px"
+                    style="width: 250px"
                   />
                   <span> 元</span>
                 </el-form-item>
@@ -1039,9 +1039,9 @@
                     clearable
                     v-model="form.workStartTime"
                     type="datetime"
-                    style="width: 195px"
+                    style="width: 250px"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    @change="listening"
+                    @change="listeningTime"
                     placeholder="请输入开始时间"
                   ></el-date-picker>
                 </el-form-item>
@@ -1052,7 +1052,7 @@
                     clearable
                     v-model="form.workEndTime"
                     type="datetime"
-                    style="width: 195px"
+                    style="width: 250px"
                     @change="listeningTime"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="请输入结束时间"
@@ -1061,7 +1061,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="维修用时" prop="workCostTime">
-                  <el-input v-model="form.workCostTime" style="width: 195px" disabled>
+                  <el-input v-model="form.workCostTime" style="width: 250px" disabled>
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -1080,35 +1080,51 @@
                   <el-cascader
                     :options="faultTypeOption"
                     v-model="form.faultType"
-                    style="width: 195px"
+                    style="width: 250px"
                     clearable
                   ></el-cascader>
                 </el-form-item>
               </el-col> -->
             </el-row>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="24">
+              <el-col :span="8">
-                <el-form-item label="原因分析" prop="workReason">
+                <el-form-item label="故障原因" prop="workReason">
-                  <el-input
+                  <el-select
                     v-model="form.workReason"
-                    placeholder="请输入原因分析"
+                    placeholder="请选择故障原因"
-                    type="textarea"
+                     @change="$forceUpdate()"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
+                      clearable
-                    style="width: 940px"
+                      filterable
-                  />
+                      style="width: 250px"
+                      @keyup.enter.native="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in workReasonOption"
+                      :key="item.faultCode"
+                      :label="item.faultSubclass"
+                      :value="item.faultSubclass"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
+              <el-col :span="8">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="24">
                 <el-form-item label="处理措施" prop="repairMeasures">
-                  <el-input
+                  <el-select
                     v-model="form.repairMeasures"
-                    placeholder="请输入处理措施"
+                    placeholder="请选择处理措施"
-                    type="textarea"
+                     @change="$forceUpdate()"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
+                      clearable
-                    style="width: 940px"
+                      filterable
-                  />
+                      style="width: 250px"
+                      @keyup.enter.native="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in repairMeasuresOption"
+                      :key="item.faultCode"
+                      :label="item.faultSubclass"
+                      :value="item.faultSubclass"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1379,7 +1395,7 @@
                     type="datetime"
                     style="width: 195px"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    @change="listening"
+                    @change="listeningTime"
                     disabled
                   ></el-date-picker>
                 </el-form-item>
@@ -1430,29 +1446,44 @@
               </el-col> -->
             </el-row>
             <el-row :gutter="10" class="mb8">
-              <el-col :span="24">
+              <el-col :span="8">
-                <el-form-item label="原因分析" prop="workReason">
+                <el-form-item label="故障原因" prop="workReason">
-                  <el-input
+                  <el-select
-                    disabled
                     v-model="form.workReason"
-                    type="textarea"
+                     @change="$forceUpdate()"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
+                      disabled
-                    style="width: 940px"
+                      clearable
-                  />
+                      filterable
+                      style="width: 250px"
+                      @keyup.enter.native="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in workReasonOption"
+                      :key="item.faultCode"
+                      :label="item.faultSubclass"
+                      :value="item.faultCode"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
-            </el-row>
+              <el-col :span="8">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="24">
                 <el-form-item label="处理措施" prop="repairMeasures">
-                  <el-input
+                  <el-select
-                    disabled
                     v-model="form.repairMeasures"
-                    placeholder="请输入处理措施"
+                     @change="$forceUpdate()"
-                    type="textarea"
+                      clearable
-                    :autosize="{ minRows: 2, maxRows: 4 }"
+                      filterable
-                    style="width: 940px"
+                      disabled
-                  />
+                      style="width: 250px"
+                      @keyup.enter.native="handleQuery"
+                  >
+                    <el-option
+                      v-for="item in repairMeasuresOption"
+                      :key="item.faultCode"
+                      :label="item.faultSubclass"
+                      :value="item.faultCode"
+                    ></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1487,6 +1518,8 @@ import {
   writeRepairOrder,
   queryEquFaultTypeTree,
 } from "@/api/device/repairOrder";
+import { listFaultReason } from "@/api/device/faultReason";
+import { listFaultMeasures } from "@/api/device/faultMeasures";
 import { getMaintenanceTeamList } from "@/api/device/equTeam";
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
@@ -1533,6 +1566,10 @@ export default {
         "text-align": "center",
         width: "250px",
       },
+      //维修处理措施模糊选择
+      repairMeasuresOption : [],
+      //原因分析模糊选择
+      workReasonOption: [],
       //检查项表格数据
       detailList: [],
       //维修前照片
@@ -1602,6 +1639,10 @@ export default {
         workPlanTimeArray: [],
         workPlanDownTimeArray: [],
       },
+      auxiliaryQueryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+      },
       //选择是否委外
       workOutsourceOption: [
         {
@@ -1680,6 +1721,8 @@ export default {
     this.getList();
     this.getTeamList();
     this.getEquFaultTypeTree();
+    this.getWorkReason();
+    this.getRepairMeasures();
   },
   methods: {
     // 生成表头序号
@@ -1743,11 +1786,24 @@ export default {
         this.loading = false;
       });
     },
-    /** 查询维修工单列表 */
+    /** 查询维修原因列表 */
+    getWorkReason() {
+      this.loading = true;
+      listFaultReason(this.auxiliaryQueryParams).then((response) => {
+        this.workReasonOption = response.rows;
+      });
+    },
+    /** 查询维修措施列表 */
+    getRepairMeasures() {
+      this.loading = true;
+      listFaultMeasures(this.auxiliaryQueryParams).then((response) => {
+        this.repairMeasuresOption = response.rows;
+      });
+    },
+    /** 查询维修班组列表 */
     getTeamList() {
       this.loading = true;
       getMaintenanceTeamList(this.queryParams).then((response) => {
-        console.log(response.rows);
         this.teamOption = response.rows;
       });
     },

src/views/index.vue

@@ -22,12 +22,20 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col :sm="12" :lg="24">
+      <el-col :span="12">
         <span style="font-size: 20px;margin: 20%;color: cadetblue;">{{deviceTitle}}</span>
       </el-col>
+      <el-col :span="12">
+        <span style="font-size: 20px;margin: 20%;color: cadetblue;">各线体生产不良率</span>
+      </el-col>
     </el-row>
     <el-row :gutter="20">
+      <el-col :span="12">
         <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+      </el-col>
+      <el-col :span="12">
+        <DeviceChartLine :chart-data="deviceChartLineData" ref="DeviceChartLine"/>
+      </el-col>
     </el-row>
   </div>
 </template>

src/views/kanban/quality/kanban1.vue

@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -2215,4 +2215,3 @@ export default {
     // opacity: 0.1;
 }
 </style>
-  

src/views/kanban/quality/kanban2.vue

@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -1531,4 +1531,3 @@ export default {
     }
 }
 </style>
-  

src/views/kanban/quality/kanban3.vue

@@ -3,7 +3,7 @@
         <div class="app-container home" style="">
             <div class="head">
                 <div class="head-content">
-                    <div class="title">榄菊设备管理云平台</div>
+                    <div class="title">榄菊质量管理平台</div>
                 </div>
                 <div class="head-logo">
                     <img src="../../../assets/images/logo.png" alt="" />
@@ -651,4 +651,3 @@ export default {
     color: #66FFFF;
 }
 </style>
-  

src/views/quality/material/index.vue

@@ -40,7 +40,7 @@
 		<!-- 列表数据 -->
 		<el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="员工编号" align="center" prop="userId" />
+			<el-table-column label="员工编号" align="center" prop="userCode" />
 			<el-table-column label="姓名" align="center" prop="userName" />
 			<el-table-column label="联系方式" align="center" prop="phonenumber" />
 			<el-table-column label="邮箱" align="center" prop="email" />
@@ -84,7 +84,12 @@
 			</el-form>
 			<el-tabs type="border-card" v-if="form.userCodes != null">
 				<el-tab-pane label="关联物料">
-					<UserBind v-if="form.userCodes != null" :optType="optType" :userCodes="form.userCodes"></UserBind>
+					<UserBind v-if="form.userCodes != null"
+					:optType="optType"
+					:userCodes="form.userCodes"
+					:userNames="form.userNames"
+					>
+					</UserBind>
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
@@ -129,6 +134,7 @@ export default {
 				userCode: null,
 				userName: null,
 				userCodes: null,
+				userNames: null,
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
@@ -174,6 +180,7 @@ export default {
 				userCode: null,
 				userName: null,
 				userCodes: null,
+				userNames: null,
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
@@ -215,8 +222,10 @@ export default {
 		/** 绑定按钮操作 */
 		handleUpdate(row) {
 			this.reset();
-			const userCodes = row.userCode || this.ids
+			const userCodes = row.userCode || this.ids;
+			const userNames = row.userName;
 			this.form.userCodes = userCodes;
+			this.form.userNames = userNames;
 			this.open = true;
 			this.title = "修改人员物料绑定";
 			this.optType = "edit";

src/views/quality/material/userbind.vue

@@ -136,7 +136,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         itemId: null,
         itemCode: null,
         materialName: null,
@@ -164,7 +165,8 @@ export default {
       leftLength: null,
       leftQueryParams: {
         materialName: null,
-         userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         pageNum: 1,
         pageSize: 20,
       },
@@ -177,7 +179,8 @@ export default {
       RNextPage: null,
       rightQueryParams: {
         materialName: null,
-         userCodes: this.userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         pageNum: 1,
         pageSize: 20,
       },
@@ -185,6 +188,7 @@ export default {
   },
   props: {
     userCodes: undefined,
+    userNames: undefined,
     optType: undefined,
   },
   created() {
@@ -269,7 +273,8 @@ export default {
     reset() {
       this.form = {
         recordId: null,
-         userCodes: this. userCodes,
+        userCode: this.userCodes,
+        userName: this.userNames,
         itemId: null,
         itemCode: null,
         materialName: null,
@@ -288,7 +293,7 @@ export default {
 
     /** 提交按钮 */
     handleChange(value, direction, movedKeys) {
-      if (this.queryParams. userCodes != null) {
+      if (this.queryParams.userCode != null) {
         this.queryParams.selectedValues = value;
         addProduct(this.queryParams).then((response) => {
           this.$modal.msgSuccess("关联成功");

src/views/wms/equipment/index.vue

@@ -169,7 +169,7 @@
         :index="indexMethod"
         label="序号"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode">
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -183,7 +183,7 @@
         label="设备名称"
         align="center"
         prop="equipmentName"
-        width="200"
+        width="300"
       />
       <el-table-column
         label="是否启用"
@@ -296,6 +296,36 @@
         prop="buyTime"
         width="200"
       />
+      <el-table-column
+        label="资产分类名称"
+        align="center"
+        prop="assetClassificationName"
+        width="100"
+      />
+      <el-table-column
+        label="资产描述"
+        align="center"
+        prop="assetDescription"
+        width="200"
+      />
+      <el-table-column
+        label="设备数量"
+        align="center"
+        prop="equipmentNumber"
+        width="100"
+      />
+      <el-table-column
+        label="存货号"
+        align="center"
+        prop="inventoryNumber"
+        width="100"
+      />
+      <el-table-column
+        label="计量单位"
+        align="center"
+        prop="unitMeasurement"
+        width="100"
+      />
       <el-table-column
         label="资产负责人"
         align="center"
@@ -394,6 +424,7 @@
                 <el-select
                   v-model="form.equipmentTypeCode"
                   placeholder="请选择设备类型"
+                  filterable
                   style="width: 195px"
                 >
                   <el-option
@@ -661,9 +692,48 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="资产分类名称" prop="assetClassificationName">
+                <el-input
+                  v-model="form.assetClassificationName"
+                  placeholder="请输入资产分类名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="资产描述" prop="assetDescription">
+                <el-input
+                  v-model="form.assetDescription"
+                  placeholder="请输入资产描述"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备数量" prop="equipmentNumber">
+                <el-input
+                  v-model="form.equipmentNumber"
+                  placeholder="请输入设备数量"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="存货号" prop="inventoryNumber">
+                <el-input
+                  v-model="form.inventoryNumber"
+                  placeholder="请输入存货号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="计量单位" prop="unitMeasurement">
+                <el-input
+                  v-model="form.unitMeasurement"
+                  placeholder="请输入计量单位"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
-
         <!-- 设备绑定备件 -->
         <div v-if="this.repairRecordSteps == 3 " class="step-body">
           <template>
@@ -1288,6 +1358,11 @@ export default {
         hourlyUnitPrice: null,
         equipmentHead: null,
         equipmentCategory : null,
+			  assetClassificationName : null,
+			  assetDescription : null,
+			  equipmentNumber : null,
+			  inventoryNumber : null ,
+			  unitMeasurement : null
       };
       this.resetForm("form");
     },