Merge remote-tracking branch 'origin/master'

src/api/orderIssure/soIssueNotify.js

@@ -40,3 +40,4 @@ export const getNoControlPartList= data => createAPI(`/orderIssure/issureNotify/
 export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searchOtherPart`,'post',data)
 export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)
 export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data)
+export const searchNotifyLogClose= data => createAPI(`/orderIssure/issureNotify/searchNotifyLogClose`,'post',data)

src/views/modules/auth/authGroup.vue

@@ -139,7 +139,7 @@
     </el-dialog>
 
     <!--  新增用户角色  -->
-    <el-dialog title="审批组操作" :close-on-click-modal="false" v-drag :visible.sync="authGroupMemberSaveDialog" width="900px">
+    <el-dialog title="审批组操作" :close-on-click-modal="false" v-drag @close="closeAuthGroupMemberSaveDialogFlag" :visible.sync="authGroupMemberSaveDialog" width="900px">
       <div style="font-size: 12px">
         <el-form :inline="true" label-position="top" :model="searchAuthBusinessData">
           <el-form-item :label="'用户名'">
@@ -903,6 +903,11 @@ export default {
         }
       })
     },
+    closeAuthGroupMemberSaveDialogFlag () {
+      this.authGroupMemberSaveDialog = false
+      this.allAuthBusinessList = []
+      this.isAuthBusinessList = []
+    },
     // 动态列开始 获取 用户保存的 格式列
     async getTableUserColumn(tableId, columnId) {
       let queryTableUser = {

src/views/modules/auth/authRule.vue

@@ -67,8 +67,23 @@
         :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>
+          <div v-if="item.columnProp === 'active'">
+            <div v-if="scope.row[item.columnProp] === 'Y'">
+              <span v-if="!item.columnHidden">{{'启用'}}</span>
+              <span v-if="item.columnImage"><img :src="'启用'"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+            <div v-if="scope.row[item.columnProp] === 'N'">
+              <span v-if="!item.columnHidden">{{'禁用'}}</span>
+              <span v-if="item.columnImage"><img :src="'禁用'"
+                                                 style="width: 100px; height: 80px"/></span>
+            </div>
+          </div>
+          <div v-else>
+            <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>
+          </div>
         </template>
       </el-table-column>
       <el-table-column
@@ -1135,14 +1150,6 @@ export default {
           this.pageIndex = data.page.currPage
           this.pageSize = data.page.pageSize
           this.totalPage = data.page.totalCount
-          // 遍历数据列表，将状态转换为中文
-          this.dataList.forEach(item => {
-            if (item.active === 'Y') {
-              item.active = '启用'
-            } else {
-              item.active = '禁用'
-            }
-          })
           // 判断是否全部存在数据
           if (this.totalPage > 0) {
             // 设置选中行
@@ -1229,6 +1236,7 @@ export default {
      * @param row
      */
     updateModal (row) {
+      console.log(row.active)
       this.modalData = {
         flag: '2',
         title: '审批规则编辑',
@@ -1293,6 +1301,7 @@ export default {
      * 审批规则信息新增/编辑
      */
     saveData () {
+      console.log(this.modalData)
       if (this.modalData.bu === '' || this.modalData.bu == null) {
         this.$message.warning('请选择BU！')
         return

src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue

@@ -115,7 +115,7 @@
         width="80"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotify(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='已下达'" @click="closeNotifyModel(scope.row)">关闭</a>
           <a type="text" size="small" v-if="scope.row.status==='已关闭'" @click="openNotify(scope.row)">开启</a>
         </template>
       </el-table-column>
@@ -284,9 +284,66 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="关闭记录" name="close">
+        <el-table
+          :data="dataList6"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList6" :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-tabs>
 
-
+    <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item >
+              <el-input
+                type="textarea"
+                v-model="closeData.closeRemark "
+                :rows="3"
+                resize='none'
+                maxlength="200"
+                show-word-limit
+                style="height: 60px" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="closeNotify()">保存</el-button>
+        <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
@@ -301,6 +358,7 @@
     ,updateNotifyStatus
     ,deleteNotifyMaterial
     ,searchNotifyLog
+    ,searchNotifyLogClose
   }from "@/api/orderIssure/soIssueNotify.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   import {getEamWorkShop} from "@/api/factory/site.js";
@@ -324,7 +382,15 @@
         dataList3: [],
         dataList4: [],
         dataList5: [],
+        dataList6: [],
         addOrUpdateVisible:false,
+        closeData:{
+          site:'',
+          notifyNo:'',
+          closeRemark:'',
+          username:this.$store.state.user.name,
+        },
+        closeModalFlag:false,
         searchData: {
           page: 1,
           limit: 100,
@@ -1158,6 +1224,62 @@
             columnWidth: 120
           },
         ],
+        columnList6:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6UserDisplay',
+            tableId: "701002Table6",
+            tableName: "申请单材料关闭明细",
+            columnProp: "userDisplay",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "操作人",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ActionTime',
+            tableId: "701002Table6",
+            tableName: "申请单材料关闭明细",
+            columnProp: "actionTime",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "操作时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ActionRemark',
+            tableId: "701002Table6",
+            tableName: "申请单材料关闭明细",
+            columnProp: "actionRemark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "关闭原因",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 300
+          },
+        ],
         favorite: false,
         dataRole: {
           partTypeDesc: [
@@ -1366,6 +1488,16 @@
               this.dataList5 = [];
             }
           });
+        }else if(this.activeName==='close'){
+          searchNotifyLogClose(this.currentRow).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList6 = data.rows
+
+            } else {
+              this.dataList6 = [];
+            }
+          });
         }else {
           searchSumNotifyMaterialList(this.currentRow).then(({data}) => {
             //区分请求成功和失败的状况
@@ -1399,19 +1531,30 @@
           }
         });
       },
-      closeNotify(row){
-        this.$confirm('确认关闭?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      closeNotifyModel(row){
+        this.closeData.site=row.site
+        this.closeData.notifyNo=row.notifyNo
+        this.closeData.closeRemark=''
+        this.closeModalFlag=true
+      },
+      closeNotify(){
+        if(this.closeData.closeRemark==null||this.closeData.closeRemark===''){
+          this.$alert("必须输入关闭原因", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
             let inData={
-              site:row.site,
-              notifyNo:row.notifyNo,
+              site:this.closeData.site,
+              notifyNo:this.closeData.notifyNo,
+              closeRemark:this.closeData.closeRemark,
+              username:this.$store.state.user.name,
               status:'已关闭',
             }
           updateNotifyStatus(inData).then(({data}) => {
             if (data && data.code === 0) {
+              this.closeModalFlag=false
               this.searchTable()
               this.$message({
                 message: '操作成功',
@@ -1425,7 +1568,7 @@
               })
             }
           })
-        })
+
       },
       openNotify(row){
         this.$confirm('确认打开?', '提示', {

src/views/modules/part/partCostInformation.vue

@@ -89,7 +89,7 @@
                 <el-input v-model="modalData.familyName" disabled style="width: 330px"></el-input>
               </el-form-item>
               <el-form-item label="计量单位">
-                <el-input v-model="modalData.umId" disabled style="width: 80px"></el-input>
+                <el-input v-model="modalData.umId2" disabled style="width: 80px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
@@ -206,7 +206,7 @@ export default {
         sourceBu: '',
         partNo: '',
         partDesc: '',
-        umId: '',
+        umId2: '',
         umName: '',
         familyId: '',
         familyName: '',
@@ -285,28 +285,46 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1UmId',
+          serialNumber: '6010011Table1UmId2',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'umId',
+          columnProp: 'umId2',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '计量单位',
+          columnLabel: '计量单位编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1PartType',
+          serialNumber: '6010011Table1UmName',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'partType',
+          columnProp: 'umName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '计量单位名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6010011,
+          serialNumber: '6010011Table1PartType2Desc',
+          tableId: '6010011Table1',
+          tableName: '物料成本表',
+          columnProp: 'partType2Desc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '零件类型',
@@ -316,7 +334,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 150
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
@@ -357,10 +375,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1OtherGroup1',
+          serialNumber: '6010011Table1ProductGroupId1',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'otherGroup1',
+          columnProp: 'productGroupId1',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '商品组1编码',
@@ -375,20 +393,20 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 6010011,
-          serialNumber: '6010011Table1OtherGroupName1',
+          serialNumber: '6010011Table1ProductGroupName1',
           tableId: '6010011Table1',
           tableName: '物料成本表',
-          columnProp: 'otherGroupName1',
+          columnProp: 'productGroupName1',
           headerAlign: 'center',
-          align: 'center',
-          columnLabel: '商品组1描述',
+          align: 'left',
+          columnLabel: '商品组1名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 150
         },
         {
           userId: this.$store.state.user.name,
@@ -817,7 +835,7 @@ export default {
         buDesc: row.buDesc,
         partNo: row.partNo,
         partDesc: row.partDesc,
-        umId: row.umId,
+        umId2: row.umId2,
         umName: row.umName,
         familyId: row.familyId,
         familyName: row.familyName,
@@ -910,7 +928,7 @@ export default {
         buNo: '',
         partNo: '',
         partDesc: '',
-        umId: '',
+        umId2: '',
         umName: '',
         familyId: '',
         familyName: '',