Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/router/index.js

@@ -168,12 +168,6 @@ export const asyncRoutes = [
         name: 'resources',
         component: () => import('@/views/pm/resources'),
         meta: { title: '生产资源配置', icon: 'example', perms: ['pm_resources'] }
-      },
-      {
-        path: 'testitem',
-        name: 'testitem',
-        component: () => import('@/views/pm/plan'),
-        meta: { title: '生产作业管理', icon: 'example', perms: ['pm_testitem'] }
       }
     ]
   }
@@ -183,7 +177,7 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/wpm/worktask',
     name: 'pm',
-    meta: { title: '车间生产', icon: 'example', perms: ['equipment_set'] },
+    meta: { title: '生产执行', icon: 'example', perms: ['equipment_set'] },
     children: [
       {
         path: 'worktask',
@@ -251,13 +245,7 @@ export const asyncRoutes = [
         component: () => import('@/views/sam/contract'),
         meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
       }
-      ,
+      
-      {
-        path: 'review',
-        name: 'review',
-        component: () => import('@/views/sam/review'),
-        meta: { title: '合同评审', icon: 'example', perms: ['index_manage'] }
-      }
       ,
       {
         path: 'order',

hb_client/src/views/inm/fifo.vue

@@ -28,7 +28,7 @@
     <el-card style="margin-top: 2px">
       <div style="margin-top: 2px">
         <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-          >新增物料</el-button
+          >新增出入库记录</el-button
         >
       </div>
       <el-table
@@ -47,15 +47,15 @@
           }}</template>
         </el-table-column>
 
-        <el-table-column label="出库入人员">
+        <el-table-column label="出/入库人员">
           <template slot-scope="scope">{{
             scope.row.operator_.username
           }}</template>
         </el-table-column>
-        <el-table-column label="出入库时间">
+        <el-table-column label="出/入库时间">
           <template slot-scope="scope">{{ scope.row.inout_date }}</template>
         </el-table-column>
-        <el-table-column label="出入库类型">
+        <el-table-column label="出/入库类型">
           <template slot-scope="scope">{{ types_[scope.row.type] }}</template>
         </el-table-column>
         <el-table-column label="是否审核">
@@ -96,7 +96,7 @@
     </el-card>
     <el-dialog
       :visible.sync="dialogVisible"
-      :title="dialogType === 'edit' ? '编辑仓库' : '新增仓库'"
+      :title="dialogType === 'edit' ? '编辑出/如库记录' : '新增出/如库记录'"
     >
       <el-form
         ref="Form"

hb_client/src/views/mtm/productprocess.vue

@@ -70,7 +70,7 @@
   <div slot="header" class="clearfix">
     <span style="font-size: 16px;
     font-weight: 700;
-">生产分解</span>
+">流程分解</span>
      </div>
    <el-button type="primary" icon="el-icon-plus" @click="handlesubproducationCreate"
         >新增</el-button>
@@ -84,7 +84,7 @@
         @current-change="handlespChange" 
       >
         <el-table-column type="index" width="50" />
-         <el-table-column label="分解产品名称">
+         <el-table-column label="名称">
           <template slot-scope="scope">{{scope.row.name}}</template>
         </el-table-column>
          <el-table-column label="工序">
@@ -120,7 +120,7 @@
    
      <el-dialog
       :visible.sync="dialogVisiblesp"
-      :title="dialogTypesp === 'edit' ? '编辑生产分解' : '新增生产分解'"
+      :title="dialogTypesp === 'edit' ? '编辑流程分解' : '新增流程分解'"
     >
       <el-form
         ref="Formsp"

hb_client/src/views/mtm/step.vue

@@ -446,7 +446,7 @@
           page_size: 20,
         },
         type_: {
-         1:'普通',
+         1:'常规',
          2:'分割',
           3:'结合',
           
@@ -462,7 +462,7 @@
         },
         typeoption: [{
           value: '1',
-          label: '普通'
+          label: '常规'
         },
           {
             value: '2',

hb_client/src/views/pm/plan.vue

@@ -30,7 +30,7 @@
          <el-table-column label="客户名称">
           <template slot-scope="scope">{{ scope.row.order_.customer_.name }}</template>
         </el-table-column>
-         <el-table-column label="产品信息">
+         <el-table-column label="产品名称" width="130">
           <template slot-scope="scope">{{ scope.row.product_.number }}-{{ scope.row.product_.name }}</template>
         </el-table-column>
        <el-table-column label="产品型号">
@@ -39,7 +39,7 @@
          <el-table-column label="产品单位">
           <template slot-scope="scope">{{ scope.row.product_.unit }}</template>
         </el-table-column>
-         <el-table-column label="生产数量">
+         <el-table-column label="生产数量" width="60">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
          <el-table-column label="计划开工时间">
@@ -52,7 +52,7 @@
           <template slot-scope="scope">{{ scope.row.order_.delivery_date }}</template>
         </el-table-column>
         
-          <el-table-column label="是否生成子计划">
+          <el-table-column label="是否生成子计划" width="60">
           <template slot-scope="scope" >
             <el-tag v-if="scope.row.is_planed==false">否</el-tag>
              <el-tag  v-if="scope.row.is_planed==true">是</el-tag>

hb_client/src/views/pm/work.vue

@@ -17,7 +17,7 @@
         <el-table-column type="index" width="50" />
         
        
-         <el-table-column label="分解产品名称">
+         <el-table-column label="名称">
           <template slot-scope="scope">{{ scope.row.subproduction_.name }}</template>
         </el-table-column>
         
@@ -30,7 +30,7 @@
          <el-table-column label="工序编号">
           <template slot-scope="scope">{{ scope.row.process_.number }}</template>
         </el-table-column>
-         <el-table-column label="子工序">
+         <el-table-column label="子工序" width="160">
            <template slot-scope="scope" v-if="scope.row.steps">
             <el-tag v-for="item in scope.row.steps"
                     :key="item.number"
@@ -52,6 +52,8 @@
          <el-table-column label="下达状态">
           <template slot-scope="scope">{{ state_[scope.row.state] }}</template>
         </el-table-column>
+          
+        
   <el-table-column label="创建时间">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>

hb_client/src/views/sam/contract.vue

@@ -26,7 +26,7 @@
     </div>
     <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增客户</el-button
+        >新增合同</el-button
       >
     </div>
     </el-card>

hb_client/src/views/wpm/worktask.vue

@@ -20,7 +20,7 @@
         >
           <el-table-column type="index" width="50" />
 
-          <el-table-column label="分解产品名称">
+          <el-table-column label="名称">
             <template slot-scope="scope">{{
               scope.row.subproduction_.name
             }}</template>
@@ -43,7 +43,7 @@
             }}</template>
           </el-table-column>
 
-          <el-table-column label="子工序">
+          <el-table-column label="子工序" width="160">
             <template slot-scope="scope" v-if="scope.row.steps">
               <el-tag
                 v-for="item in scope.row.steps"
@@ -71,7 +71,9 @@
               <el-tag v-else>已领料</el-tag>
             </template>
           </el-table-column>
-
+          <el-table-column label="生产进度">
+          <template slot-scope="scope">{{ scope.row.main_count_real }}/{{scope.row.main_count}}</template>
+        </el-table-column>
           <el-table-column label="创建时间">
             <template slot-scope="scope">{{ scope.row.create_time }}</template>
           </el-table-column>