bugfix: 169、161、158、141

src/views/modules/cus/contract-add-or-update.vue

@@ -36,6 +36,7 @@
             <el-form-item label="沟通编码" prop="coCode">
               <el-select
                 v-model="dataForm.coCode"
+                ref="coSelectRef"
                 :disabled="display"
                 remote
                 placeholder="请选择"
@@ -44,7 +45,7 @@
                   v-for="item in options1"
                   :key="item.value"
                   :label="item.coCode + ' (' + item.customerName + ')'"
-                  :value="item.coCode">
+                  :value="item">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -185,6 +186,10 @@
         <el-row class="my-row">
           <upload-component :display="display" :title="'合同评审表'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess" templateCode="contract_review_htpsyjb"/>
         </el-row>
+        <div style="margin-top: 20px" v-if="isCommVisible">
+          <h3>合同沟通信息：</h3>
+          <communicate-detail ref="commDetail"/>
+        </div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="onChose">取消</el-button>
@@ -199,9 +204,10 @@
   import { getDictList } from '@/api/dict'
   import { dealStepData, dealStepLogs } from '@/api/util'
   import UploadComponent from '../common/upload-component'
-  export default {
+  import CommunicateDetail from '@/views/modules/cus/communicate-detail'
+export default {
     name: 'stock-order-inbound',
-    components: {UploadComponent},
+    components: {CommunicateDetail, UploadComponent},
     computed: {
       orgId: {
         get () { return this.$store.state.user.orgId }
@@ -210,6 +216,7 @@
     data () {
       return {
         visible: false,
+        isCommVisible: false,
         dictType: 'material_type',
         options: [],
         options1: [],
@@ -344,8 +351,15 @@
         this.$refs.dataForm.validateField(type)
       },
       coListSelected (item) {
-        // todo
-        // console.log('item = ' + JSON.stringify(item))
+        this.dataForm.coCode = item.coCode
+        this.dataForm.coId = item.coId
+        this.showComm(item.coId)
+      },
+      showComm (id) {
+        this.isCommVisible = true
+        this.$nextTick(() => {
+          this.$refs.commDetail.init(id, null, true)
+        })
       }
     }
   }

src/views/modules/production/damage.vue

@@ -106,21 +106,6 @@
           min-width="120"
           label="状态">
         </el-table-column>
-        <el-table-column
-          prop="workFlowBusinessExt.state"
-          header-align="center"
-          align="center"
-          :formatter="formatWorkFlowState"
-          min-width="120"
-          label="审批状态">
-        </el-table-column>
-        <el-table-column
-          prop="workFlowBusinessExt.currentApproverName"
-          header-align="center"
-          align="center"
-          min-width="160"
-          label="当前审批人">
-        </el-table-column>
         <el-table-column
           fixed="right"
           header-align="center"
@@ -129,7 +114,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 && scope.row.workFlowBusinessExt && 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" type="text" size="small" @click="reScheduleHandle(scope.row.recordId)">重新排产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -236,14 +221,6 @@
         if (Number(row.state) === 2) return '已重新排产'
         return ''
       },
-      formatWorkFlowState (row) {
-        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 '审批完成'
-        if (Number(row.workFlowBusinessExt.state) === 4) return '审批不通过'
-        return ''
-      },
       // 重新排产
       reScheduleHandle (id) {
         reSchedule(id).then(({data}) => {

src/views/modules/tech-manage/process-add-or-update.vue

@@ -9,15 +9,7 @@
       label-width="120px"
     >
       <el-row class="my-row">
-        <el-col :span="6">
-          <el-form-item label="编码" prop="cruxCode">
-            <el-input
-              v-model="dataForm.cruxCode"
-              placeholder="请输入编码"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        <el-col :span="9">
           <el-form-item label="物料名称" prop="productId">
             <el-select
               v-model="dataForm.productId"
@@ -39,7 +31,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="9">
           <el-form-item label="关键特殊名称" prop="cruxName">
             <el-input
               v-model="dataForm.cruxName"
@@ -170,4 +162,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

src/views/modules/works/work-center.vue

@@ -137,6 +137,7 @@
         </el-table-column>
         <el-table-column
             prop="state"
+            fixed="right"
             header-align="center"
             align="center"
             min-width="120"
@@ -180,6 +181,7 @@
         </el-table-column>
         <el-table-column
             prop="receiverName"
+            fixed="right"
             header-align="center"
             align="center"
             min-width="140"