Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -4,7 +4,8 @@
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 
             <el-form :inline="true">
-                <h1>{{ titleName }}</h1>
+                <el-form-item ><div  :style="{ fontSize: '24px', fontWeight: 'bold', fontFamily: 'Arial' }">{{ titleName }}</div></el-form-item>
+
                 <el-form-item label="产品名称">
                     <el-input v-model="name" placeholder="请输入" clearable="true" size="small">
                     </el-input>
@@ -126,8 +127,8 @@
         </el-table>
 
         <!--工具条-->
-        <el-col :span="24" class="toolbar" v-if="false">
-            <el-button size="small" @click="batchSetWudulistBtn1"
+        <el-col :span="24" class="toolbar" >
+           <!--  <el-button size="small" @click="batchSetWudulistBtn1"
                 v-if="(user.timeType.customDegreeActive || user.company.packageProject) && (showColumnWidth != '0' || permissions.projectManagement)">{{
                     $t('btn.cancel') }}</el-button>
             <template v-if="user.timeType.customDegreeActive && (showColumnWidth != '0' || permissions.projectManagement)">
@@ -147,28 +148,14 @@
                     $t('projectmanagersinbatches') }}</el-button>
                 <el-button size="small" type="primary" v-if="user.roleName = '超级管理员'" @click="batchDelete()"
                     :loading="isDeleting">批量删除</el-button>
-            </template>
+            </template> -->
 
             <el-pagination :key="projectListPageComponentKey" @size-change="handleSizeChange"
-                @current-change="handleCurrentChange" :page-sizes="[20, 50, 80, 100]" :page-size="size"
+                @current-change="handleCurrentChange" :page-sizes="[10, 20, 50, 100]" :page-size="size"
                 :current-page.sync="page" layout="total, sizes, prev, pager, next" :total="total"
                 style="float:right;"></el-pagination>
         </el-col>
 
-        <div class="layout-container-floor">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="pageIndex"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="pageSize"
-            layout="total, prev, pager, next, sizes, jumper"
-            :total="total"
-            style="float:right;"
-          >
-          </el-pagination>
-        </div>
-
         <!--新增界面-->
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false"
             customClass="customWidth" width="960px" :top="'6vh'">
@@ -180,7 +167,7 @@
                 <el-step title="派工单"></el-step>
                 <!--   <el-step title="物料信息"></el-step> -->
             </el-steps>
-            <div v-if="prodEditActive == 0" style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
+            <div v-if="prodEditActive == 0" style="height: 60.5vh;overflow-y: auto;overflow-x: hidden;">
                 <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
                     <el-form-item label="产品名称" prop="name">
                         <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
@@ -216,24 +203,23 @@
                     <el-form-item label="描述" prop="description">
                         <!-- <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="4000"></el-input> -->
                         <!-- <el-input v-model="addForm.description" :placeholder="$t('peaseenterthe')" clearable maxlength="200"  show-word-limit></el-input> -->
-                        <el-input v-model="addForm.description" placeholder="产品特征" clearable maxlength="200"
-                            show-word-limit></el-input>
+                       <!--  <el-input v-model="addForm.description" placeholder="产品特征" clearable maxlength="200"
+                            show-word-limit></el-input> -->
+                        <el-input
+                            type="textarea"
+                            :autosize="{ minRows: 2, maxRows: 4 }"
+                            maxlength="200"
+                            clearable
+                            placeholder="产品特征"
+                            v-model="addForm.description">
+                        </el-input>    
 
                     </el-form-item>
                 </el-form>
             </div>
             <div v-if="prodEditActive == 1">
                  <!--此处是录入工序的模块-->
-                <!-- el-form ref="form2"  :rules="rules1" label-width="120px">
-                    <el-form-item  prop="version">
-                        <el-input placeholder="请输入工序版本号" v-model="procedureVersion" class="input-pM"></el-input>
-                    </el-form-item>
-
-
-                    <el-form-item label=""></el-form-item>
-                </el-form> -->
-
-
+                
 
                 <el-input placeholder="请输入工序版本号" v-model="procedureVersion" clearable maxlength="50" class="input-pM"></el-input>
                 <el-table :data="procedureLit" style="width: 100%">
@@ -242,12 +228,12 @@
                             <el-input v-model="scope.row.name" clearable placeholder="请输入"  maxlength="30"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="workingTime" label="单件工时"  width="180">
+                    <el-table-column prop="workingTime" label="单件工时(分)"  width="180">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.workingTime"   clearable maxlength="11" placeholder="请输入"></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="unitPrice" label="单件工价"  width="180">
+                    <el-table-column prop="unitPrice" label="单件工价(元)"  width="180">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.unitPrice"   clearable maxlength="9"  placeholder="请输入"></el-input>
                         </template>
@@ -370,12 +356,12 @@
 
 
         <!-- 产品分类管理 -->
-        <el-dialog title="分类管理" :visible.sync="isganttshow" width="50%" >
+        <el-dialog title="分类管理" :visible.sync="isganttshow" width="40%" >
             <div>
                 <el-table :data="categoryList" style="width: 100%">
                     <el-table-column type="index" width="180" label="序号">
                     </el-table-column>
-                    <el-table-column prop="name" label="分类名称" width="180">
+                    <el-table-column prop="name" label="分类名称" width="200">
                     </el-table-column>
                     <el-table-column label="操作">
                         <template slot-scope="scope">
@@ -1397,17 +1383,13 @@ export default {
         // 进入页面所执行的函数
         mountedEnter() {
             this.cateId = this.$route.params.cateId;
+            this.page = 1;
             console.log('分类参数', this.cateId);
             this.getCateName();
             this.userssHu()
             this.getDepartment();
             this.getDepartment2();
             this.projectListPageComponentKey++;
-            //localStorage中为string类型，需转化为int类型才会发生渲染
-            if (localStorage.productPageIndex) {
-                this.page = parseInt(localStorage.productPageIndex);
-            }
-
             this.getList();
             this.getUsers();
         },
@@ -2965,7 +2947,6 @@ export default {
 
         //获取项目列表
         getList() {
-            localStorage.productPageIndex = this.page;
             this.listLoading = true;
             let parameter = {
                 pageIndex: this.page,
@@ -3006,6 +2987,7 @@ export default {
                 res => {
                     this.listLoading = false;
                     if (res.code == "ok") {
+                        this.page=1
                         this.cateName = res.data.name;
                         this.titleName = '产品管理-' + this.cateName;
                     } else {
@@ -3586,24 +3568,10 @@ export default {
     },
     activated() {
         var cateId = this.$route.params.cateId;
+        
         console.log('activated分类参数', cateId);
     },
     mounted() {
-        // this.cateId =  this.$route.params.cateId;
-        // console.log('分类参数', this.cateId);
-        // this.getCateName();
-        // this.userssHu()
-        // this.getDepartment();
-        // this.getDepartment2();
-        // this.projectListPageComponentKey++;
-        // //localStorage中为string类型，需转化为int类型才会发生渲染
-        // if (localStorage.productPageIndex) {
-        //     this.page = parseInt(localStorage.productPageIndex);
-        // }
-
-        // this.getList();
-        // this.getUsers();
-
         // 进入页面需要执行的函数和方法全写在 mountedEnter 函数里面
         this.mountedEnter()
     }

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/team/index.vue

@@ -254,7 +254,7 @@
         </el-col>
       </div>
       <!-- 工种列表 -->
-       <el-dialog title="工种管理" :visible.sync="isganttshow" width="50%" :before-close="handleClose">
+       <el-dialog title="工种管理" :visible.sync="isganttshow" width="40%" :before-close="handleClose">
               <div>
                   <el-table :data="workTypeList" style="width: 100%">
                       <el-table-column type="index" width="180" label="序号">