Merge remote-tracking branch 'origin/master'

index.html

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>CCL-PLM</title>
+  <title>CCL Design</title>
   <% if (process.env.NODE_ENV === 'production') { %>
   <!-- 生产环境 -->
   <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

src/api/part/partInformation.js

@@ -307,3 +307,5 @@ export const downLoadFile = data => createAPI(`/plm/partInformation/downLoadFile
 
 export const getPartRevisionEngChgLevel = data => createAPI(`/plm/partInformation/getPartRevisionEngChgLevel`,'post',data)
 
+export const queryPartUnitCostList = data => createAPI(`/plm/partInformation/queryPartUnitCostList`,'post',data)
+

src/api/tool/tool_info.js

@@ -12,3 +12,6 @@ export const removeToolInfo = data => createAPI('plm/tool/removeToolInfo', 'POST
 // 删除
 export const removeToolInstance = data => createAPI('plm/tool/removeToolInstance', 'POST', data)
 
+export const updateToolStandardCost = data => createAPI('/plm/projectToolingApplication/updateToolStandardCost', 'POST', data)
+
+

src/views/main-navbar.vue

@@ -10,7 +10,7 @@
             <icon-svg name="zhedie"></icon-svg>
           </el-menu-item>
         </el-menu>
-        <a class="site-navbar__brand-lg" href="javascript:;">{{'CCL PLM'}}</a>
+        <a class="site-navbar__brand-lg" href="javascript:;">{{'CCL Design'}}</a>
         <a class="site-navbar__brand-mini" href="javascript:;">{{ pageLanguage.abbreviation }}</a>
       </h1>
 

src/views/modules/part/partInformation.vue

@@ -332,6 +332,28 @@
                 <el-input-number :controls="false" :step="0" v-model="modalData.estimatedMaterialCost" style="width: 461px"></el-input-number>
               </el-form-item>
             </el-form>
+            <el-table
+              :data="unitCostList"
+              height="320px"
+              border
+              ref="unitCostTable"
+              style="width:100%">
+              <el-table-column
+                v-for="(item,index) in columnUnitCostList" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed == ''?false:item.fixed"
+                :min-width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
 
           <el-tab-pane label="Misc Part Info" name="MiscPartInfo">
@@ -1433,6 +1455,7 @@
     getProjectPartNo, // 获取物料编码
     getNextPartNo, // 获取下一个物料编码
     getPartRevisionEngChgLevel, // 获取下一个物料revision
+    queryPartUnitCostList, // 查询物料的 unitCost 列表
   } from '@/api/part/partInformation.js'
   import {
     getFileContentList, // 获取物料单附件列表
@@ -1744,6 +1767,7 @@
         itemList1:[],
         itemList2:[],
         revisionList: [],
+        unitCostList: [],
         bomAlternativeList: [],
         routingAlternativeList: [],
         copyAttributeList: [],
@@ -2914,6 +2938,38 @@
             fixed: '',
           },
         ],
+        columnUnitCostList: [
+          {
+            columnProp: 'lotBatchNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'Lot/Batch No',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'serialNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'Serial No',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+          },
+          {
+            columnProp: 'inventoryValue',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'Unit Cost',
+            columnHidden: false,
+            columnImage: false,
+            status: true,
+            fixed: '',
+          },
+        ],
         columnBomAlternativeList: [
           {
             columnProp: 'engChgLevel',
@@ -3157,6 +3213,9 @@
 
       // 刷新页签的table数据
       refreshInventoryPartTable () {
+        if (this.inventoryPartTable === 'Costs') {
+          this.queryPartUnitCostList()
+        }
         if (this.inventoryPartTable === 'Revisions') {
           this.queryPartRevisionList()
         }
@@ -3177,6 +3236,22 @@
         })
       },
 
+      // 查询物料的 unitCost 列表
+      queryPartUnitCostList () {
+        let tempData = {
+          site: this.modalData.site,
+          partNo: this.modalData.partNo,
+          configurationId: this.modalData.configurationId
+        }
+        queryPartUnitCostList(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.unitCostList = data.rows
+          } else {
+            this.unitCostList = []
+          }
+        })
+      },
+
       // 新增revision模态框
       savePartRevisionModal () {
         this.revisionData = {

src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue

@@ -88,7 +88,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="6">
-            <el-form-item  label="客户项目料号：">
+            <el-form-item  label="客户项目料号">
               <el-input v-model="dataForm.customerProjectNo"  ></el-input>
             </el-form-item>
           </el-col>

src/views/modules/project/projectInfo/com_project_info_part.vue

@@ -591,6 +591,12 @@
           <el-form-item :label="'物料名称'">
             <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
+          <el-form-item :label="'物料状态'">
+            <el-select v-model="searchData.searchType" @change="searchTypeChange" style="width: 120px">
+              <el-option label="Project Part" value="Y"></el-option>
+              <el-option label="Inventory Part" value="N"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label=" ">
             <el-button type="primary" @click="getPartList">查询</el-button>
           </el-form-item>
@@ -688,6 +694,16 @@
                 align="left"
                 min-width="120"
                 label="BU">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.buNo" style="width:98%">
+                    <el-option
+                      v-for = "i in buList"
+                      :key = "i.buNo"
+                      :label = "i.buNo"
+                      :value = "i.buNo">
+                    </el-option>
+                  </el-select>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="buDesc"
@@ -724,6 +740,9 @@
 </template>
 
 <script>
+import {
+  getBuBySite, // 根据site查bu
+} from '@/api/changeManagement/changeManagement.js'
   import {
     getProjectInfoPartList,
     saveProjectPart,
@@ -795,7 +814,8 @@
           site: '',
           username: this.$store.state.user.name,
           projectId: '',
-          customerId: ''
+          customerId: '',
+          searchType: 'Y'
         },
         visible: false,
         dataListLoading: false,
@@ -1413,10 +1433,28 @@
           partNo: '',
           partDesc: ''
         },
-        partModelFlag: false
+        partModelFlag: false,
+        buList: [],
       }
     },
+
+    created() {
+      this.getBuBySite()
+    },
+
     methods: {
+      // 获取用户的bu
+      getBuBySite () {
+        let tempData = {
+          site: this.$store.state.user.site,
+        }
+        getBuBySite(tempData).then(({data}) => {
+          if (data.code === 0) {
+            this.buList = data.rows
+          }
+        })
+      },
+
       /**
        * 获取基础数据列表S
        * @param val
@@ -1550,9 +1588,10 @@
       //初始化组件的参数
       init(inData) {
         //初始化参数
-        this.searchData = JSON.parse(JSON.stringify(inData));
+        this.searchData = JSON.parse(JSON.stringify(inData))
+        this.searchData.searchType = 'Y'
         //刷新表格
-        this.searchTable();
+        this.searchTable()
 
       },
 
@@ -2004,6 +2043,7 @@
         this.partSelections2 = []
         this.partList1 = []
         this.partList2 = []
+        this.searchData.searchType = 'Y'
         getProjectPartList(this.searchData).then(({data}) => {
           this.partListAll = data.row1
           this.partList1 = this.partListAll
@@ -2016,6 +2056,19 @@
         })
       },
 
+      // 改变事件
+      searchTypeChange () {
+        getProjectPartList(this.searchData).then(({data}) => {
+          this.partListAll = data.row1
+          this.partList1 = this.partListAll
+          this.partData = {
+            site: this.$store.state.user.site,
+            partNo: '',
+            partDesc: ''
+          }
+        })
+      },
+
       // 关闭后刷新列表
       refreshDetailList () {
         this.searchTable()

src/views/modules/tooling/manuf_tool.vue

@@ -272,6 +272,23 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 80
+        }, {
+          userId: this.$store.state.user.name,
+          functionId: 106003,
+          serialNumber: '106003TableStandardCost',
+          tableId: "106003Table1",
+          tableName: "刀具信息主表",
+          columnProp: "standardCost",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "工具成本",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
         },
         {
           userId: this.$store.state.user.name,