Merge remote-tracking branch 'origin/master' into master

src/views/ProductionProcess/qualityTest.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-quaTest">
     <div class="testSearch" style="margin-left: 10px">
       <el-form  ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="开工时间" prop="revisedStartDate">
@@ -419,7 +419,7 @@ export default {
 
 <style lang="scss">
 
-.app-container{
+.app-container-quaTest{
   font-size: 18px;
   padding: 0;
   .testSearch {

src/views/ProductionProcess/workOrder.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-workOrder">
     <div class="workOrderSearch" style="margin-left: 10px">
       <el-form ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="工单编号" prop="orderNo">
@@ -185,7 +185,7 @@
                 <div class="labelName">工单编号</div>
                 <div class="labelName">Order No.</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.orderNo }}</div>
+              <el-input :disabled="true" v-model="form.orderNo"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -194,7 +194,7 @@
                 <div class="labelName">成品料号</div>
                 <div class="labelName">Part No.</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.partNo }}</div>
+              <el-input :disabled="true" v-model="form.partNo"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -203,7 +203,7 @@
                 <div class="labelName">模型类型</div>
                 <div class="labelName">Model</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.modelType1 }}</div>
+              <el-input :disabled="true" v-model="form.modelType1"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -212,7 +212,7 @@
                 <div class="labelName">创建时间</div>
                 <div class="labelName">Build Time</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.createDate }}</div>
+              <el-input :disabled="true" v-model="form.createDate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -221,7 +221,7 @@
                 <div class="labelName">计划开工时间</div>
                 <div class="labelName">Start Time</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.revisedStartDate }}</div>
+              <el-input :disabled="true" v-model="form.revisedStartDate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -230,7 +230,7 @@
                 <div class="labelName">计划完工时间</div>
                 <div class="labelName">End Time</div>
               </div>
-              <div style="background-color: #E9E9E9">{{ form.revisedDueDate }}</div>
+              <el-input :disabled="true" v-model="form.revisedDueDate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -239,9 +239,7 @@
                 <div class="labelName">工厂</div>
                 <div class="labelName">Factory</div>
               </div>
-              <div v-if="form.contract === 'NB'" style="background-color: #E9E9E9">北京</div>
-              <div v-else-if="form.contract === 'NOSZ'" style="background-color: #E9E9E9">苏州</div>
-              <div v-else style="background-color: #E9E9E9">-</div>
+              <el-input :disabled="true" v-model="form.contract"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -250,9 +248,7 @@
                 <div class="labelName">工单类型</div>
                 <div class="labelName">Order Type</div>
               </div>
-              <div v-if="form.type === '1'" style="background-color: #E9E9E9">装配线</div>
-              <div v-else-if="form.type === '2'" style="background-color: #E9E9E9">包装线</div>
-              <div v-else style="background-color: #E9E9E9">-</div>
+              <el-input style="background-color: #E9E9E9" :disabled="true" v-model="form.type"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -597,12 +593,42 @@ export default {
       this.open = true
       if (row.isModel === '1') {
         getOrder1(row.businessId).then(response1 => {
-          this.form = response1.data
+          let tempData = response1.data
+          if (tempData.contract === 'NB') {
+            tempData.contract = '北京'
+          } else if (tempData.contract === 'NOSZ') {
+            tempData.contract = '苏州'
+          } else  {
+            tempData.contract = '-'
+          }
+          if (tempData.type === '1') {
+            tempData.type = '装配线'
+          } else if (tempData.type === '2') {
+            tempData.type = '包装线'
+          } else  {
+            tempData.type = '-'
+          }
+          this.form = tempData
           this.Loading4 = false
         })
       } else {
         getOrder(row.businessId).then(response => {
-          this.form = response.data
+          let tempData = response.data
+          if (tempData.contract === 'NB') {
+            tempData.contract = '北京'
+          } else if (tempData.contract === 'NOSZ') {
+            tempData.contract = '苏州'
+          } else  {
+            tempData.contract = '-'
+          }
+          if (tempData.type === '1') {
+            tempData.type = '装配线'
+          } else if (tempData.type === '2') {
+            tempData.type = '包装线'
+          } else  {
+            tempData.type = '-'
+          }
+          this.form = tempData
           this.Loading4 = false
         })
       }
@@ -779,7 +805,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container{
+.app-container-workOrder{
   font-size: 18px;
   padding: 0;
   .workOrderSearch {
@@ -811,6 +837,10 @@ export default {
   .el-table th .cell{
     display: inline-block!important;
   }
+  .el-col-8 {
+    position: relative;
+    right: 20px;
+  }
   .table-drop{
     vertical-align: 2px;
     line-height: 20px;
@@ -835,8 +865,7 @@ export default {
   }
   .labelClass{
     position: relative;
-    right: 13px;
-    bottom: -5px;
+    bottom: 1px;
     text-align: center;
   }
   .labelClassRequired{
@@ -863,6 +892,11 @@ export default {
   .el-dialog__headerbtn:hover .el-dialog__close {
     color: #D20A10;
   }
+  .el-input {
+    [disabled] {
+      background-color:#E9E9E9;
+    }
+  }
 }
 .workOrderDialogImport{
   .el-dialog .el-dialog__body{

src/views/productTraceability/assembling.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-assembling">
     <div class="assemblingSearch" style="margin-left: 10px">
       <el-form :rules="rules" ref="queryParams" :model="queryParams" :inline="true" :hide-required-asterisk="true">
         <el-form-item label="SN编码" prop="materSn">
@@ -206,7 +206,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container{
+.app-container-assembling{
   font-size: 18px;
   padding: 0;
   .assemblingSearch {

src/views/productTraceability/packing.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-packing">
     <div class="packingSearch" style="margin-left: 10px">
       <el-form ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="包装追溯号" prop="lineCode">
@@ -293,7 +293,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container{
+.app-container-packing{
   font-size: 18px;
   padding: 0;
   .packingSearch {

src/views/productionInfo/MaterialFile.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-mater">
     <div class="materialSearch" style="margin-left: 10px">
       <el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="物料料号" prop="materCode">
@@ -678,7 +678,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container{
+.app-container-mater{
   font-size: 18px;
   padding: 0;
   .materialSearch {

src/views/productionInfo/Station.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-station">
     <div class="stationSearch" style="margin-left: 10px">
       <el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="工站编号" prop="staCode">
@@ -432,7 +432,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container{
+.app-container-station{
   font-size: 18px;
   padding: 0;
   .stationSearch {

src/views/system/dept/index.vue

@@ -173,7 +173,7 @@
       </el-table>
     </div>
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :close-on-click-modal="false" class="deptDialog" title="部门信息" :visible.sync="open" width="60%" append-to-body>
+    <el-dialog :close-on-click-modal="false" class="deptDialog" title="部门信息" :before-close="handleClose" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" v-loading="updateLoading" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col v-if="form.parentId !== 0" :span="24">
@@ -218,7 +218,7 @@
                 <div class="labelName">部门排序</div>
                 <div class="labelName">Dept Sort</div>
               </div>
-              <el-input-number @change="orderNumChange" v-model="form.orderNum" controls-position="right" :min="0" />
+              <el-input-number v-model="form.orderNum" :precision="0" :min="0" :max="9999" controls-position="right" @change="orderNumChange" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -335,7 +335,7 @@ export default {
           { required: true, message: '请输入部门名称', trigger: 'blur' }
         ],
         orderNum: [
-          { required: true, message: '请输入部门顺序', trigger: 'blur' }
+          { required: true, message: '请输入部门排序', trigger: 'blur' }
         ],
         deptCode: [
           { required: true, message: '请输入部门编码', trigger: 'blur' }
@@ -408,7 +408,7 @@ export default {
     //   })
     // },
     changeValue() {
-      console.log('来了')
+      console.log('来了', this.form.parentId)
       this.$refs.form.validateField('parentId')
     },
     /** 转换部门数据结构 */
@@ -431,6 +431,11 @@ export default {
       this.open = false
       this.reset()
     },
+    handleClose() {
+      console.log('before')
+      this.form.parentId = undefined
+      this.open = false
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -473,6 +478,7 @@ export default {
       if (row !== undefined) {
         this.form.parentId = row.businessId
       }
+      console.log('新增按钮操作', this.form.parentId)
       this.open = true
       this.title = '添加部门'
       listDept().then(response => {
@@ -513,6 +519,7 @@ export default {
                   type: 'success'
                 })
                 this.open = false
+                this.form.parentId = undefined // 防止再次新增的时候触发treeselect的@input事件
                 this.getList()
               }
             })
@@ -524,6 +531,7 @@ export default {
                   type: 'success'
                 })
                 this.open = false
+                this.form.parentId = undefined // 防止再次新增的时候触发treeselect的@input事件
                 this.getList()
               }
             })

src/views/system/device/index.vue

 <template>
-  <div class="app-container">
+  <div class="app-container-device">
     <div class="devSearch" style="margin-left: 10px">
       <el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true">
         <el-form-item label="设备名称" prop="deviceName">
@@ -366,11 +366,13 @@ export default {
     },
     /** 新增设备方法 **/
     handleAdd() {
+      this.Loading1 = true
       this.reset()
       this.title = '新增设备'
       this.queryStationFun()
       this.getDictFun()
       this.open = true
+      this.Loading1 = false
     },
     /** 状态修改方法 **/
     handleStatusChange(row) {
@@ -483,7 +485,7 @@ export default {
 </script>
 
 <style lang="scss">
-.app-container {
+.app-container-device{
   font-size: 18px;
   padding: 0;
   .devSearch {
@@ -528,7 +530,7 @@ export default {
   }
   .labelClass{
     position: relative;
-    right: 1px;
+    right: 14px;
     text-align: center;
   }
   .labelClassRequired{
@@ -537,5 +539,13 @@ export default {
     bottom: 17px;
     right: 13px;
   }
+  .el-col-12 {
+    position: relative;
+    left: 10px;
+  }
+  .el-col-24 {
+    position: relative;
+    left: 10px;
+  }
 }
 </style>