Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/check/fc-detail.vue

@@ -9,13 +9,13 @@
         <div style="margin-left: 20px;margin-right: 20px">
           <e-desc title="基本信息">
             <e-desc-item label="物料名称">{{dataForm.productName}}</e-desc-item>
-            <e-desc-item label="物料编号">{{dataForm.prodCode}}</e-desc-item>
+            <e-desc-item label="物料编号">{{dataForm.productNumber}}</e-desc-item>
             <e-desc-item label="状态">{{dataForm.state?optionsStates.find(item => item.code === dataForm.state).value:''}}</e-desc-item>
 
             <e-desc-item label="工艺名称">{{dataForm.techName}}</e-desc-item>
             <e-desc-item label="工序号">{{dataForm.stepName}}</e-desc-item>
 
-            <e-desc-item label="记录说明" span="3">{{dataForm.recordsNote}}</e-desc-item>
+            <e-desc-item label="记录说明" span="3">{{dataForm.operationRecords}}</e-desc-item>
 
             <e-desc-item label="检验员">{{dataForm.operation}}</e-desc-item>
             <e-desc-item label="检验时间">{{dataForm.operationTime}}</e-desc-item>

src/views/modules/check/finish-check.vue

@@ -33,7 +33,7 @@
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="prodCode"
+          prop="productNumber"
           header-align="center"
           align="center"
           width="120"

src/views/modules/cus/quoted-detail.vue

@@ -40,7 +40,6 @@
         <approve-component ref="approve" @approveFinished="approveFinished" />
       </div>
       <e-desc title="基本信息" column="3">
-        <e-desc-item label="沟通信息">{{ dataForm.coCode }}</e-desc-item>
         <e-desc-item label="项目名称">{{ dataForm.projectName }}</e-desc-item>
         <e-desc-item label="项目类别">{{ dataForm.typeName }}</e-desc-item>
         <e-desc-item label="备注" span="3">{{ dataForm.remark }}</e-desc-item>
@@ -492,4 +491,4 @@ export default {
   font-size: 16px;
   line-height: 1.5715;
 }
-</style>
+</style>

src/views/modules/production/damage.vue

@@ -4,13 +4,13 @@
     <template v-if="!detailVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
         <el-form-item label="物料名称">
-          <el-input v-model="dataForm.name" placeholder="物料名称" clearable/>
+          <el-input v-model="dataForm.productName" placeholder="物料名称" clearable/>
         </el-form-item>
         <el-form-item label="合同号">
           <el-input v-model="dataForm.orderCode" placeholder="合同号" clearable/>
         </el-form-item>
         <el-form-item label="物料编号">
-          <el-input v-model="dataForm.prodCode" placeholder="物料编号" clearable/>
+          <el-input v-model="dataForm.productNumber" placeholder="物料编号" clearable/>
         </el-form-item>
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
@@ -36,7 +36,7 @@
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="prodCode"
+          prop="productNumber"
           header-align="center"
           align="center"
           width="160"
@@ -129,7 +129,7 @@
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('prod:damage:info')" type="text" size="small" @click="detailHandle(scope.row.recordId)">查看</el-button>
-            <el-button v-if="isAuth('prod:damage:again') && Number(scope.row.state) !== 2 && Number(scope.row.workFlowBusinessExt.state) == 3" type="text" size="small" @click="reScheduleHandle(scope.row.recordId)">重新排产</el-button>
+            <el-button v-if="isAuth('prod:damage:again') && Number(scope.row.state) !== 2 && scope.row.workFlowBusinessExt && Number(scope.row.workFlowBusinessExt.state) === 3" type="text" size="small" @click="reScheduleHandle(scope.row.recordId)">重新排产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -185,9 +185,9 @@
         let params = {
           'current': this.pageIndex,
           'size': this.pageSize,
-          'productName': this.dataForm.name ? this.dataForm.name : null,
+          'productName': this.dataForm.productName ? this.dataForm.productName : null,
           'orderCode': this.dataForm.orderCode ? this.dataForm.orderCode : null,
-          'prodCode': this.dataForm.prodCode ? this.dataForm.prodCode : null
+          'productNumber': this.dataForm.productNumber ? this.dataForm.productNumber : null
         }
         getDamageList(params).then(({data}) => {
           if (data && data.code === '200') {
@@ -237,7 +237,7 @@
         return ''
       },
       formatWorkFlowState (row) {
-        if (!row.workFlowBusinessExt.state) return ''
+        if (!row.workFlowBusinessExt || !row.workFlowBusinessExt.state) return ''
         if (Number(row.workFlowBusinessExt.state) === 1) return '待审批'
         if (Number(row.workFlowBusinessExt.state) === 2) return '审批中'
         if (Number(row.workFlowBusinessExt.state) === 3) return '审批完成'

src/views/modules/production/recording.vue

@@ -33,7 +33,7 @@
           label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="prodCode"
+          prop="productNumber"
           header-align="center"
           align="center"
           min-width="100"
@@ -41,7 +41,7 @@
           label="物料编号">
         </el-table-column>
         <el-table-column
-          prop="orderCode"
+          prop="contractNumber"
           header-align="center"
           align="center"
           min-width="140"

src/views/modules/tech-manage/process-add-note-change.vue

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <div class="my-title">变更通知人设置</div>
+    <!-- 表单 -->
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      label-width="auto"
+    >
+      <el-row class="my-row">
+        <el-form-item label="通知接收人" prop="userIds">
+          <user-components
+            v-model="dataForm.userIds"
+            :userIds.sync="dataForm.userIds"
+            @change="userSelectedChanged"
+          />
+        </el-form-item>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </div>
+</template>
+
+<script>
+import UserComponents from '../common/user-components'
+export default {
+  name: 'process-add-note-change',
+  components: {
+    UserComponents
+  },
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        userIds: []
+      },
+      dataRule: {
+        userIds: [
+          { required: true, message: '请选择通知接收人', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  created () {},
+  methods: {
+    onChose () {
+      this.$emit('onChose')
+    },
+    async init () {
+      this.dataForm = {}
+      this.$http({
+        url: this.$http.adornUrl(
+          `/biz-service/pro-crux-course/noteChangeConfig`
+        ),
+        method: 'get'
+      }).then(({ data }) => {
+        if (data && data.code === '200') {
+          this.dataForm = {
+            userIds: data.data
+          }
+        }
+      })
+      this.visible = true
+    },
+    validateField (type) {
+      this.$refs.dataForm.validateField(type)
+    },
+    // 表单提交
+    dataFormSubmit () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl(
+              `/biz-service/pro-crux-course/noteChangeConfig`
+            ),
+            method: 'post',
+            data: this.dataForm.userIds
+          }).then(({ data }) => {
+            if (data && data.code === '200') {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.onChose()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
+    },
+    userSelectedChanged (val) {
+      this.dataForm.userIds = val
+    }
+  }
+}
+</script>
+
+<style scoped></style>

src/views/modules/tech-manage/process-manage.vue

@@ -231,7 +231,7 @@ import ProcessAddOrUpdate from './process-add-or-update.vue'
 import AttachDetail from '../common/attach-detail'
 import ProcessDetail from './process-detail'
 import ProcessChange from './process-change'
-import NoteChange from './material-tech-note-change'
+import NoteChange from './process-add-note-change'
 
 export default {
   name: 'tech-manage-process-manage',