Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/modules/srmPart/partApprovalList.vue
#	src/views/modules/srmPart/partInfoList.vue

src/views/modules/srmPart/com_part_Approval.vue

@@ -21,9 +21,9 @@
       style="width: 100%;">
       <!-- <el-table-column prop="nodeOrder" label="序号" width="60" header-align="center" align="center"></el-table-column>
       <el-table-column prop="nodeName" label="节点名称" min-width="100" header-align="center" align="center"></el-table-column> -->
-      <el-table-column prop="departmentName" label="审批部门" min-width="100" header-align="center" align="center">
-        <template slot-scope="scope">{{ scope.row.departmentName || '-' }}</template>
-      </el-table-column>
+<!--      <el-table-column prop="departmentName" label="审批部门" min-width="100" header-align="center" align="center">-->
+<!--        <template slot-scope="scope">{{ scope.row.departmentName || '-' }}</template>-->
+<!--      </el-table-column>-->
         <el-table-column prop="assigneeName" label="要求审批人" min-width="80" header-align="center" align="center"></el-table-column>
 
       <!-- <el-table-column prop="attemptNo" label="次数" width="60" header-align="center" align="center"></el-table-column>

src/views/modules/srmPart/partApprovalList.vue

@@ -74,11 +74,7 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{
-            item.columnProp === 'status'
-              ? (scope.row.status === 'Y' ? '在用' : scope.row.status === 'N' ? '禁用' : scope.row.status)
-              : scope.row[item.columnProp]
-          }}</span>
+          <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: 100px"/></span>
         </template>
@@ -161,7 +157,7 @@
           </el-col>
         </el-row> -->
           <el-row :gutter="20">
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="是否特殊放行">
               <el-select v-model="approveData.specialRelease" style="width: 100%">
                 <el-option label="否" value="N"></el-option>
@@ -401,7 +397,7 @@ export default {
           columnProp: 'status',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '是否在用',
+          columnLabel: '状态',
           columnWidth: '80',
           columnHidden: false,
           columnImage: false,
@@ -686,7 +682,6 @@ export default {
         flowCode: row.flowCode,
         flowVersion: row.flowVersion,
         nodeCode: row.nodeCode,
-        specialRelease: 'N',
         comment: ''
 
       }

src/views/modules/srmPart/partInfoList.vue

@@ -43,8 +43,8 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden">{{
-            item.columnProp === 'status'
-              ? (scope.row.status === 'Y' ? '在用' : scope.row.status === 'N' ? '禁用' : scope.row.status)
+            item.columnProp === 'partStage'
+              ? formatPartStageDesc(scope.row.partStage)
               : scope.row[item.columnProp]
           }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
@@ -166,10 +166,10 @@
                 </el-form-item>
               </el-col>
                <el-col :span="6">
-               <el-form-item label="是否在用">
+               <el-form-item label="状态">
                   <el-select v-model="currentpart.status" placeholder="请选择" >
-                    <el-option label="在用" value="Y"></el-option>
-                    <el-option label="禁用" value="N"></el-option>
+                    <el-option label="启用" value="N"></el-option>
+                    <el-option label="停用" value="Y"></el-option>                 
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -461,6 +461,24 @@ export default {
           status: true,
           fixed: false
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: 'partTablePartStage',
+          tableId: 'partTable',
+          tableName: '产品信息',
+          columnProp: 'partStage',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '物料阶段',
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
@@ -470,7 +488,7 @@ export default {
           columnProp: 'status',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '是否在用',
+          columnLabel: '状态',
           columnWidth: '80',
           columnHidden: false,
           columnImage: false,
@@ -583,7 +601,7 @@ export default {
         sourcingName: '',
         category: '',
         unit: '',
-        status: 'Y',
+        status: 'N',
         codeNo: '',
         createBy: '',
         remark: '',
@@ -629,6 +647,9 @@ export default {
  
 
   methods: {
+    formatPartStageDesc (partStage) {
+      return partStage === 'Approved' ? '正式物料' : '新增物料'
+    },
     getBaseList (val, type) {
       this.tagNo = val
       this.$nextTick(() => {
@@ -773,7 +794,9 @@ export default {
         params: this.searchData,
         fileName: this.exportName + '.xlsx',
         rowFetcher: res => res.data,
-        columnFormatter: [],
+        columnFormatter: [
+          { columnProp: 'partStage', formatter: (val) => this.formatPartStageDesc(val) }
+        ],
         dropColumns: []
       })
     },
@@ -841,7 +864,7 @@ export default {
         sourcingName: '',
         category: '',
         unit: '',
-        status: 'Y',
+        status: 'N',
         codeNo: '',
         createBy: this.$store.state.user.name,
         remark: '',