名称、log相关调整

.env.development

 # 页面标题
-VUE_APP_TITLE = 宝绅-生产执行系统
+VUE_APP_TITLE = 腾燊嘉诚-生产执行系统
 
 # 开发环境配置
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.3.181:8100'
+VUE_APP_BASE_API = 'http://localhost:8089'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.mes

 # 页面标题
-VUE_APP_TITLE = 宝绅-生产执行系统
+VUE_APP_TITLE = 腾燊嘉诚-生产执行系统
 
 NODE_ENV = production
 
@@ -7,4 +7,4 @@ NODE_ENV = production
 ENV = 'mes'
 
 # 若依管理系统/测试环境
-VUE_APP_BASE_API = 'http://192.168.3.181:8100'
+VUE_APP_BASE_API = 'http://192.168.222.60:8089'

.env.production

 # 页面标题
-VUE_APP_TITLE = 宝绅-生产执行系统
+VUE_APP_TITLE = 腾燊嘉诚-生产执行系统
 
 # 生产环境配置
 ENV = 'production'

.env.staging

 # 页面标题
-VUE_APP_TITLE = 宝绅-生产执行系统
+VUE_APP_TITLE = 腾燊嘉诚-生产执行系统
 
 NODE_ENV = production
 

src/layout/components/Sidebar/Logo.vue

@@ -43,7 +43,7 @@ export default {
       if (roles.includes("OrderRole")){
         return "订单管理系统"
       }
-      return '宝绅系统';
+      return '腾燊嘉诚系统';
     }
   },
   data() {

src/views/login.vue

@@ -9,7 +9,7 @@
       </div>
       <div class="index_from page-account-container from-wh">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-          <h3 class="title">宝绅系统</h3>
+          <h3 class="title">腾燊嘉诚系统</h3>
           <el-form-item prop="username">
             <el-input
               v-model="loginForm.username"

src/views/mes/md/factory/index.vue

@@ -34,7 +34,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+       <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -52,8 +52,7 @@
           :disabled="single"
           @click="handleUpdate"
         >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col><el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -62,7 +61,7 @@
           :disabled="multiple"
           @click="handleDelete"
         >删除</el-button>
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -76,7 +75,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="factoryList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="工厂id" align="center" prop="factoryId" />-->
         <el-table-column label="工厂编码" align="center" prop="factoryCode" >
         <template slot-scope="scope">

src/views/mes/md/workshop/index.vue

@@ -23,7 +23,7 @@
       </el-form-item>
     </el-form>
 
-    <!-- <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -57,7 +57,7 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row> -->
+    </el-row>
 
     <el-table v-loading="loading" :data="workshopList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -311,7 +311,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-  
+
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

src/views/mes/md/workstation/index.vue

@@ -9,23 +9,6 @@
       label-width="100px"
     >
       <el-row>
-        <el-col :span="6">
-          <el-form-item label="工厂" prop="factory">
-            <el-select
-              v-model="form.factoryCode"
-              class="form-item"
-              clearable
-              placeholder="请选择工厂"
-            >
-              <el-option
-                v-for="item in factoryCodes"
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="工作中心编码" prop="workstationCode">
             <el-input
@@ -102,7 +85,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -125,7 +108,7 @@
           v-hasPermi="['mes:md:workstation:remove']"
           >删除</el-button
         >
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -227,23 +210,6 @@
         label-width="120px"
       >
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="工厂" prop="factoryCode">
-              <el-select
-                v-model="form.factoryCode"
-                class="form-item"
-                clearable
-                placeholder="请选择工厂"
-              >
-                <el-option
-                  v-for="item in factoryCodes"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="工作中心编号" prop="workstationCode">
               <el-input
@@ -409,7 +375,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          
+
       </el-row>
       <el-row>
         <el-col :span="12">
@@ -554,10 +520,6 @@ export default {
         value: "pId",
         label: "pName",
       },
-      factoryCodes: [
-        { value: "1000", label: "广州市宝绅科技应用有限公司" },
-        { value: "1010", label: "广州市宝绅科技有限公司RFID工厂" },
-      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -657,7 +619,7 @@ export default {
       });
     },
 
-    
+
 
 
     // 取消按钮

src/views/mes/md/workunit/index.vue

@@ -74,7 +74,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -84,7 +84,7 @@
           v-hasPermi="['md:workunit:add']"
           >新增</el-button
         >
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -211,7 +211,6 @@
         ref="form"
         :model="form"
         :rules="rules"
-        disabled
         label-width="80px"
       >
         <el-row>

src/views/mes/order/purchase/index.vue

@@ -190,7 +190,7 @@
           show-overflow-tooltip
         />
         <el-table-column
-          label="宝绅内部品名"
+          label="内部品名"
           prop="productName"
           width="140"
           show-overflow-tooltip

src/views/mes/order/purchaseDetail/index.vue

@@ -52,7 +52,7 @@
         <el-table-column label="loss数量" prop="lossNum" min-width="120"/>
         <el-table-column label="产品数量" prop="num" min-width="120"/>
         <el-table-column label="状态" prop="state" min-width="120"/>
-        <el-table-column label="宝绅内部品名" prop="productName" min-width="120"/>
+        <el-table-column label="内部品名" prop="productName" min-width="120"/>
         <el-table-column label="客户产品名称" prop="poProductName" min-width="120"/>
         <el-table-column label="客户产品代码" prop="poProductNo" min-width="120"/>
         <el-table-column label="客户颜色" prop="poColor" min-width="120"/>
@@ -182,7 +182,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="宝绅内部品名" prop="productName">
+            <el-form-item label="内部品名" prop="productName">
               <el-input v-model.trim="detailForm.productName" clearable placeholder="请输入"/>
             </el-form-item>
           </el-col>

src/views/mes/pro/workorder/print/productOrderSpecification.vue

 <template>
   <div class="productOrderSpecification">
     <div class="pageTop">
-      <div class="titles">广州市宝绅科技应用有限公司</div>
+      <div class="titles">腾燊嘉诚</div>
       <div class="img">
         <img width="140" src="@/assets/logo/logo.png" alt="">
       </div>
       <div class="pageContent">
-        <div>电话：020-36201735 36343998</div>
-        <div>邮箱：<u>gzbaoshen@gzbaoshen.com</u></div>
+        <div>电话：</div>
+        <div>邮箱：</div>
       </div>
       <div class="pageContent">
-        <div>传真：020-36201782 36201962</div>
-        <div style="padding-right:50px;">网站：<u>www.gzbaoshen.com</u></div>
+        <div>传真：</div>
+        <div style="padding-right:50px;">网站：</div>
       </div>
       <div class="titles">
         <div class="cdbh">存档编号:</div>

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 const CompressionPlugin = require('compression-webpack-plugin')
 
 // const name = process.env.VUE_APP_TITLE || 'MES-软件开发记录' // 网页标题
-const name = '宝绅-生产执行系统' // 网页标题
+const name = '腾燊嘉诚-生产执行系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -36,8 +36,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-        target: `http://192.168.3.181:8100`,
+        target: `http://localhost:8089`,
+        //target: `http://192.168.3.91:8100`,
         // target: `http://192.168.4.122:8080`,
         changeOrigin: true,
         pathRewrite: {
@@ -45,7 +45,7 @@ module.exports = {
         }
       },
       '/ureport': {
-        target: 'http://localhost:8080',
+        target: 'http://192.168.222.60:8080',
         ws:false,
         changeOrigin: true,
         pathRewrite: {