Merge remote-tracking branch 'origin/master'

src/views/ProductionProcess/workOrder.vue

@@ -630,11 +630,11 @@ export default {
     getStatus(status) {
       switch (status) {
         case 0:
-          return '待开工'
+          return '待生产'
         case 1:
-          return '已开工'
+          return '生产中'
         case 2:
-          return '已结束'
+          return '已完成'
       }
     },
     /** 编辑按钮方法 */

src/views/productionInfo/ProductionModel.vue

@@ -405,7 +405,10 @@ export default {
             type: 'success',
             message: '删除成功!'
           })
-          this.handleQuery()
+          const totalPage = Math.ceil((this.total - 1) / this.queryParams.rows)
+          const currentPage = this.queryParams.page > totalPage ? totalPage : this.queryParams.page
+          this.queryParams.page = currentPage < 1 ? 1 : currentPage
+          this.getList()
         })
       }).catch(() => {
       })

src/views/system/dept/index.vue

@@ -75,7 +75,7 @@
             <div>Dept Name</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" :show-overflow-tooltip="true" prop="businessId" label="部门Id" width="260">
+        <el-table-column align="center" :show-overflow-tooltip="true" prop="businessId" label="部门Id" width="100">
           <template slot="header">
             <div>部门Id</div>
             <div>Dept Id</div>
@@ -87,7 +87,7 @@
             <div>Dept Number</div>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="orderNum" align="center" width="200">
+        <el-table-column :show-overflow-tooltip="true" prop="orderNum" align="center" width="70">
           <template slot="header">
             <div>排序</div>
             <div>Sort</div>
@@ -116,7 +116,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作"  align="center" class-name="small-padding fixed-width">
           <template slot="header">
             <div>操作</div>
             <div>Operation</div>
@@ -240,7 +240,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item  class="labelHeight" label="部门状态">
+            <el-form-item  v-if="!dataId" class="labelHeight" label="部门状态">
               <div slot="label" class="labelClass">
                 <div class="labelName">部门状态</div>
                 <div class="labelName">dept Status</div>
@@ -282,6 +282,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      dataId: '',
       // 搜索条件
       showSearch: true,
       // 遮罩
@@ -440,6 +441,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
+      this.dataId = ''
       this.reset()
       if (row !== undefined) {
         this.form.parentId = row.businessId
@@ -458,6 +460,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.dataId = row.businessId
       this.reset()
       getDept(row.businessId).then(response => {
         this.form = response.data