委外

src/views/modules/msg-center/notice.vue

@@ -1,4 +1,4 @@
-<!-- 订单 -->
+<!-- 通知 -->
 <template>
   <div class="msg">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
@@ -54,6 +54,8 @@
         prop="type"
         header-align="center"
         align="center"
+        :min-width="100"
+        :show-tooltip-when-overflow="true"
         label="消息类型">
         <template slot-scope="scope">
           <span>{{scope.row.type? optionsType[scope.row.type].value:'' }}</span>
@@ -63,6 +65,8 @@
         prop="publisherName"
         header-align="center"
         align="center"
+        :min-width="100"
+        :show-tooltip-when-overflow="true"
         label="发布人">
       </el-table-column>
       <el-table-column

src/views/modules/production/scheduling.vue

@@ -1,7 +1,7 @@
 <!-- 排产管理 -->
 <template>
   <div class="production">
-    <template v-if="!detailsVisible">
+    <template v-if="!detailsVisible && !outsourceVisible">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryPage()">
         <el-form-item label="订单编号">
           <el-input v-model="dataForm.orderCode" placeholder="订单编号" clearable/>
@@ -92,7 +92,7 @@
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('prod:production:plan')" type="text" size="small" @click="detail(scope.row.id, true)">排产</el-button>
-            <el-button v-if="false" type="text" size="small" disabled>委外生产</el-button>
+            <el-button v-if="isAuth('pur:commDetail:save')" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -108,18 +108,22 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <detail v-if="detailsVisible" ref="details" @close="closeDialogEvent" @refreshDataList="getDataList" @onChose="onChose"/>
+    <!-- 委外 -->
+    <outsource v-if="outsourceVisible" ref="outsource" @refreshDataList="getDataList" @onChose="onChose"/>
   </div>
 </template>
 
 <script>
   import Detail from './scheduling-details'
+  import Outsource from '../sale/outsource-add-or-update'
   import { getSchedulingList, batchPlan } from '@/api/production'
   export default {
     name: 'scheduling',
-    components: {Detail},
+    components: {Detail, Outsource},
     data () {
       return {
         detailsVisible: false,
+        outsourceVisible: false,
         dataForm: {},
         dataList: [],
         pageIndex: 1,
@@ -151,6 +155,7 @@
     methods: {
       onChose () {
         this.detailsVisible = false
+        this.outsourceVisible = false
       },
       handleSelectionChange (val) {
         this.multipleSelection = val
@@ -234,6 +239,12 @@
       },
       closeDialogEvent () {
         this.detailsVisible = false
+      },
+      outsourceHandle (id) {
+        this.outsourceVisible = true
+        this.$nextTick(() => {
+          this.$refs.outsource.init(id)
+        })
       }
     }
   }

src/views/modules/sale/outsource-add-or-update.vue

@@ -0,0 +1,168 @@
+<!-- 委外新增、修改 -->
+<template>
+    <div>
+        <div class="my-title">{{ !id?'新增':'修改' }}</div>
+        <!-- 表单 -->
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
+          <el-row class="my-row">
+            <el-col :span="8">
+              <el-form-item label="合同编码" prop="contractCode">
+                <el-input v-model="dataForm.contractCode" disabled placeholder="合同编码由系统生成"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同类别" prop="contractType">
+                <el-select
+                  v-model="dataForm.contractType"
+                  remote
+                  placeholder="请选择">
+                  <el-option
+                    v-for="item in optionsType"
+                    :key="item.code"
+                    :label="item.value"
+                    :value="item.code">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="采购/委外单据" prop="contractNumber">
+                <el-input v-model="dataForm.contractNumber" placeholder="合同号"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="my-row">
+            <el-col :span="8">
+              <el-form-item label="合同号" prop="contractNumber">
+                <el-input v-model="dataForm.contractNumber" placeholder="合同号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同金额" prop="actualDeliveryTime">
+                <el-input-number v-model="dataForm.actualDeliveryTime" :step="1" :min="0" :precision="1"></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="my-row" style="margin-top: 20px">
+            <el-form-item label="备注" prop="notes">
+              <el-input type="textarea" v-model="dataForm.notes"></el-input>
+            </el-form-item>
+          </el-row>
+          <el-row class="my-row">
+            <upload-component :title="'附件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
+          </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 UploadComponent from '../common/upload-component'
+  import { getContractDetail } from '@/api/sale'
+
+export default {
+    name: 'contract-add-or-update',
+    components: {
+      UploadComponent
+    },
+    computed: {
+      orgId: {
+        get () { return this.$store.state.user.orgId }
+      }
+    },
+    data () {
+      return {
+        id: 0,
+        dataForm: {},
+        dataRule: {
+          // reCode: [{ required: true, message: '请选择合同评审编码', trigger: 'change' }],
+          // contractNumber: [{ required: true, message: '合同号不能为空', trigger: 'blur' }],
+          // deliveryTime: [{ required: true, message: '合同交期不能为空', trigger: 'change' }]
+        },
+        optionsType: [],
+        fileList: []
+      }
+    },
+    methods: {
+      onChose () {
+        this.$emit('onChose')
+      },
+      async init (id) {
+        this.fileList = []
+        this.dataForm = {}
+        this.id = id || 0
+        // 详情
+        if (!id) return
+        await getContractDetail(this.id).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+            // 附件
+            if (data.data.attachList) {
+              data.data.attachList.forEach((item) => {
+                this.fileList.push({
+                  name: item.fileName,
+                  url: item.url,
+                  id: item.url
+                })
+              })
+            }
+          }
+        })
+      },
+      uploadSuccess (fileList) {
+        this.fileList = fileList
+      },
+      validateField (type) {
+        this.$refs.dataForm.validateField(type)
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            // 附件
+            let fList = this.fileList
+            if (fList.length > 0) {
+              this.dataForm.attachList = []
+              for (let i = 0; i < fList.length; i++) {
+                this.dataForm.attachList.push({
+                  fileName: fList[i].name,
+                  url: fList[i].url
+                })
+              }
+            } else {
+              this.$message.error('请上传文件')
+              return
+            }
+            // 产品明细
+            this.$http({
+              url: this.$http.adornUrl(`/biz-service/purPurchaseContract/${!this.id ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData({...this.dataForm, orgId: this.orgId})
+            }).then(({data}) => {
+              if (data && data.code === '200') {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.onChose()
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/sale/outsource-detail.vue

@@ -185,7 +185,7 @@
   import EDesc from '../common/e-desc'
   import EDescItem from '../common/e-desc-item'
   import { dealStepData, dealStepLogs } from '@/api/util'
-  import { getOutsourceDetail, getPurCommInfo } from '@/api/sale'
+  import { getOutsourceDetail } from '@/api/sale'
   import ApproveComponent from '../common/approve-component'
   export default {
     name: 'outsource-detail',