。

fhKeeper/formulahousekeeper/management-workshop/pom.xml

@@ -118,11 +118,11 @@
             <artifactId>java-sdk</artifactId>
         </dependency>
         <!-- hutool工具包 -->
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>5.8.16</version>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdCategoryServiceImpl.java

@@ -1,6 +1,5 @@
 package com.management.platform.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.management.platform.config.exception.CustomServiceException;
@@ -13,8 +12,8 @@ import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.ProdCategoryService;
 import com.management.platform.util.HttpRespMsg;
 import io.micrometer.core.instrument.util.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -37,7 +36,7 @@ public class ProdCategoryServiceImpl extends ServiceImpl<ProdCategoryMapper, Pro
     private ProductMapper productMapper;
 
     @Override
-    public HttpRespMsg saveOrUpdateInfo(ProdCategory prodCategory, HttpServletRequest request){
+    public HttpRespMsg saveOrUpdateInfo(ProdCategory prodCategory, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
 
         String token = request.getHeader("Token");
@@ -48,7 +47,7 @@ public class ProdCategoryServiceImpl extends ServiceImpl<ProdCategoryMapper, Pro
                 .selectOne(new LambdaQueryWrapper<ProdCategory>()
                         .eq(StringUtils.isNotBlank(prodCategory.getName()), ProdCategory::getName, prodCategory.getName()));
 
-        if (ObjectUtil.isNotNull(prodCategory1) && !prodCategory1.getId().equals(prodCategory.getId())) {
+        if (ObjectUtils.allNotNull(prodCategory1) && !prodCategory1.getId().equals(prodCategory.getId())) {
             throw new CustomServiceException("分类已存在");
         }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/test/TestApplicationTests.java

@@ -8,6 +8,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
@@ -18,16 +19,17 @@ public class TestApplicationTests {
     @Resource
     private RedisUtil redisUtil;
     @Value(value = "${upload.path}")
-    private String  path;
+    private String path;
     @Resource
     private PicContentKeywordsMapper picContentKeywordsMapper;
+
     @Test
     public void contextLoads() {
 //        //初始化redis关键词
 //        redisUtil.deleteKey("keyWords");
         List<PicContentKeywords> picContentKeywords = picContentKeywordsMapper.selectList(null);
-        for (PicContentKeywords  keyWord : picContentKeywords) {
-            redisUtil.sSetJsonString("keyWords",keyWord);
+        for (PicContentKeywords keyWord : picContentKeywords) {
+            redisUtil.sSetJsonString("keyWords", keyWord);
         }
 //
         Set<Object> keyWords = redisUtil.members("keyWords");
@@ -55,5 +57,3 @@ public class TestApplicationTests {
 //        System.out.println(redisUtil.members("keyWords").toString());
 
     }
-
-}

fhKeeper/formulahousekeeper/timesheet-workshop-h5/package-lock.json

@@ -1817,6 +1817,59 @@
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz",
@@ -1846,6 +1899,41 @@
           "requires": {
             "ansi-regex": "^5.0.0"
           }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.8.3",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.2",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+              "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            }
+          }
         }
       }
     },
@@ -12112,94 +12200,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true,
-          "optional": true
-        },
-        "emojis-list": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
-          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-router": {
       "version": "3.5.1",
       "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.5.1.tgz?cache=0&sync_timestamp=1617697843139&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.5.1.tgz",

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/InsertionPlan/InsertionPlanItem.vue

@@ -2,7 +2,7 @@
   <div class="InsertionPlanItem">
     <div class="planItem_header">
       <div>{{ planList.taskName }}</div>
-      <div>{{ planList.startDate + '-' + planList.endDate }}</div>
+      <div>{{ planList.startDate.replace(/-/g, '') +'-'+ planList.endDate.replace(/-/g, '') }}  </div>
     </div>
     <div class="planItem_conter" @click="toAdd()">
       <div class="item"><p>计划人数:</p><span>{{ planList.planManNum }}人</span></div>
@@ -74,7 +74,7 @@ export default {
         this.peopleListId =  this.planList.planProcedureTotals[0] ? this.planList.planProcedureTotals[0].teamIds ? this.planList.planProcedureTotals[0].teamIds.split(',') : [] : []
         this.popupShow = true
       }
-      
+
     },
     // 获取人员
     getPeople() {
@@ -162,7 +162,7 @@ export default {
       right: 2px;
       margin-top: -10px;
     }
-    
+
     .item {
       width: 50%;
       display: flex;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -7,9 +7,9 @@
             <div>{{ item.productName}}</div>
             <div>{{ item.productSchedulingNum }}</div>
             <div>
-              <p>{{ item.startDate }}-{{ item.endDate }}</p><span @click="workShowHide(index)">{{ item.flg ? paiArr[0] : paiArr[1] }}</span>
+              <p>{{ item.startDate.replace(/-/g, '') }}-{{ item.endDate.replace(/-/g, '') }}</p><span @click="workShowHide(index)">{{ item.flg ? paiArr[0] : paiArr[1] }}</span>
             </div>
-          </div> 
+          </div>
           <collapse>
             <div v-if="item.flg">
               <div :class="`planComponent_ItemBom planComponent_show`">
@@ -76,7 +76,7 @@ export default {
   computed: {},
   watch: {},
   created() { },
-  mounted() { 
+  mounted() {
     // if(this.titleText == '今日计划') {
     //   this.paiArr = ['收起', '派工']
     //   this.type = 0
@@ -101,7 +101,7 @@ export default {
           departmentId: item.stationId,
           titleText: this.titleText,
           type: this.type,
-          dates: item.startDate + '-' + item.endDate,
+          dates: item.startDate.replace(/-/g, '') +'-'+ item.endDate.replace(/-/g, ''),
           productSchedulingNum: item.productSchedulingNum,
           productName: item.productName,
         }
@@ -222,4 +222,4 @@ export default {
       }
     }
   }
-}</style>
+}</style>

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -10,7 +10,7 @@
     <div class="distribution_con contentRoll">
       <div class="distribution_box" v-for="item,index in distributionList" :key="index">
         <div class="distribution_ItemBom">
-          <van-checkbox :disabled="item.checkboxDisabled"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
+          <van-checkbox v-if="todayAndTomorrow" :disabled="item.checkboxDisabled"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
           </van-checkbox>
           <div class="PlanItem">
             <span>{{ item.prodProcedure.name }}</span>
@@ -68,7 +68,7 @@
       <ChooseSomeone ref="ChooseSomeone" :groupView="this.groupViewNum" :type="this.peopleType" :groupViewBack="true" :peopleList="peopleList" @ChooseSomeoneChanhe="chooseSomeoneChanhe" :peopleListId="peopleListId" :key="ChooseSomeoneKey"></ChooseSomeone>
     </van-popup>
   </div>
-  <div class="formBatch" >
+  <div class="formBatch" v-if="todayAndTomorrow">
         <van-checkbox v-model="isAllChecked" :disabled="distributionList.length == 0" @click="allChecked" shape="square" style="padding-left:3vw"></van-checkbox>
         <div style="padding:1vh 2vw">
         <van-button @click="batchReceive()" :disabled="!isCanAgree || distributionList.length == 0" type="info" size="small">批量接收</van-button>
@@ -223,12 +223,14 @@ export default {
                 ids:ids
               }
             ).then(res => {
-              if (res.code == "ok") {
+              if (res.code === "ok") {
                 this.isAllChecked=false
                 this.isCanAgree=false
                 this.getDistributionList()
+                this.$toast.success('接收成功');
               } else {
                 this.$toast.clear();
+                console.log("bbb")
                 this.$toast.fail(res.msg);
               }
             }).catch(err => { this.$toast.clear(); })
@@ -289,7 +291,7 @@ export default {
       }
       if(this.beDeptList) {
         console.log(item, index)
-        
+
         this.distributionIndex = index
         this.popupShow = true
       }
@@ -302,7 +304,7 @@ export default {
       .then(res => {
         if (res.code == "ok") {
           res.data.forEach(item => { item.flg = false })
-          let arr = res.data 
+          let arr = res.data
           for(var i in arr) {
             arr[i].checkboxDisabled = true
             if(arr[i].prodProcedureTeamList&&arr[i].prodProcedureTeamList.length > 0) {
@@ -429,7 +431,7 @@ export default {
       padding-right: 100px;
       justify-content: space-between;
       margin-top: 10px;
-      
+
     }
   .distribution {
     width: 100%;
@@ -472,7 +474,7 @@ export default {
             width: 50%;
             display: flex;
             padding-top: 12px;
-            
+
 
             &:first-child {
               width: 100%;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -4,7 +4,7 @@
     <div class="distribution_header">
         <div>{{reportForm.product_name}}</div>
         <div>{{reportForm.plan_type == 0? reportForm.product_scheduling_num:reportForm.task_change_notice_num}}</div>
-        <div>{{reportForm.start_date}}至{{reportForm.end_date}}</div>
+        <div>{{reportForm.start_date.replace(/-/g, '')}}-{{reportForm.end_date.replace(/-/g, '')}}</div>
     </div>
 
     <van-form @submit="onSubmit">
@@ -164,7 +164,7 @@ export default {
 
     //打开报工页面
     reportItem(item) {
-        
+
     },
   },
 };

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/workView.vue

@@ -2,7 +2,7 @@
   <div class="distribution">
     <van-nav-bar title="报工" left-text="返回" @click-left="back" fixed left-arrow />
     <div class="distribution_con contentRoll">
-      <div> 
+      <div>
         <van-field v-model="vehicleNum" type="digit" label="车辆序号" @blur="getMyPlanProcedureList()"/>
       </div>
       <van-empty v-if="myPlanProcedureList.length == 0">暂无待报工任务</van-empty>
@@ -10,7 +10,7 @@
         <div class="distribution_header">
           <div class="textDis">{{ prod.plan_type == 0 ? prod.product_name : prod.task_name }}</div>
           <div v-if="prod.plan_type == 0">{{ prod.product_scheduling_num }}</div>
-          <div>{{ prod.start_date }}至{{ prod.end_date }}</div>
+          <div>{{ prod.start_date.replace(/-/g, '') }}-{{ prod.end_date.replace(/-/g, '') }}</div>
           <div v-if="prod.vehicle_num_start &&  prod.vehicle_num_end">{{ prod.vehicle_num_start }}-{{ prod.vehicle_num_end }}</div>
         </div>
         <div class="distribution_box" v-for="item, index in prod.procedureList" :key="index" @click="reportItem(item)">

fhKeeper/formulahousekeeper/timesheet-workshop-h5/vue.config.js

@@ -7,19 +7,19 @@ const Timestamp = new Date().getTime();
 // var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
 //var ip = '192.168.2.12'
-var ip = '192.168.2.12'
+//var ip = '192.168.2.12'
 //  var ip = '127.0.0.1'
 
 
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 
 module.exports = {
     runtimeCompiler: true,

fhKeeper/formulahousekeeper/timesheet-workshop/config/index.js

@@ -4,17 +4,17 @@ var path = require('path')
 // var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
 // var ip = '192.168.10.2'
-var ip = '192.168.2.12' 
+//var ip = '192.168.2.12'
 
-// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-// for (var i in ifaces) {
-//     for (var j in ifaces[i]) {
-//         var val = ifaces[i][j]
-//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-//             ip = val.address
-//         }
-//     }
-// }
+var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+for (var i in ifaces) {
+    for (var j in ifaces[i]) {
+        var val = ifaces[i][j]
+        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+            ip = val.address
+        }
+    }
+}
 // 1196735749
 module.exports = {
   build: {

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

@@ -4,7 +4,7 @@
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
 
             <el-form :inline="true">
-                <el-form-item ><div  :style="{ fontSize: '24px', fontWeight: 'bold', fontFamily: 'Arial' }">{{ titleName }}</div></el-form-item>
+                <el-form-item ><div  :style="{ fontSize: '20px' }">{{ titleName }}</div></el-form-item>
 
                 <el-form-item label="产品名称">
                     <el-input v-model="name" placeholder="请输入" clearable="true" size="small">
@@ -358,14 +358,14 @@
 
 
         <!-- 产品分类管理 -->
-        <el-dialog title="分类管理" :visible.sync="isganttshow" width="40%" >
+        <el-dialog title="分类管理" :visible.sync="isganttshow" width="700" >
             <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="200">
+                    <el-table-column prop="name" label="分类名称">
                     </el-table-column>
-                    <el-table-column label="操作">
+                    <el-table-column label="操作" width="240">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="updateCategory(scope.row)">编辑</el-button>
                             <el-button size="mini" @click="deleteCategory(scope.row)">删除</el-button>
@@ -3012,7 +3012,8 @@ export default {
                     if (res.code == "ok") {
                         this.page=1
                         this.cateName = res.data.name;
-                        this.titleName = '产品管理-' + this.cateName;
+                        // this.titleName = '产品管理-' + this.cateName;
+                        this.titleName = this.cateName;
                     } else {
                         this.$message({
                             message: res.msg,