生产版本提交

src/api/saleOrder/index.js

@@ -73,4 +73,13 @@ export async function getProductVersion (code) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
+}
+
+// 获取订单详情 
+export async function getOrderDetail (code) {
+  const res = await request.get( `/aps/salesorder/getByCode/${code}` );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

src/components/CreatePlan/ProductionVersion.vue

@@ -27,7 +27,7 @@
 	  </el-table-column>
 	  <el-table-column label="选择" align="center">
 		   <template slot-scope="scope">
-			 <el-radio class="radio" v-model="radio" :label="scope.row.id"><i></i></el-radio>
+			 <el-radio class="radio" v-model="radio" :label="scope.row.produceVersionId"><i></i></el-radio>
 		   </template>
 	  </el-table-column>
 	</el-table>
@@ -77,7 +77,7 @@ export default {
 	  // 单击获取id
 	  single (row) {
 		  this.current = row
-	       this.radio = row.id;
+	       this.radio = row.produceVersionId;
 	  },
 	  /* 保存编辑 */
 	  save() {

src/enum/dict.js

@@ -18,4 +18,4 @@ export default {
   交付要求: 'require_ments'
 };
 
-export const numberList = ['patrol_cycle','order_library','order_type','require_ments','order_source','production_status'];
+export const numberList = ['urgent_type','patrol_cycle','order_library','order_type','require_ments','order_source','production_status'];

src/views/saleOrder/components/create-order.vue

@@ -1,7 +1,7 @@
 <template>
   <ele-modal
     :visible.sync="visible"
-    title="创建订单"
+    :title="title"
     width="80vw"
     append-to-body
   >
@@ -64,7 +64,7 @@
 			</el-col>
 		</el-row>
 		<el-table
-		  :data="form.productInfoAddPos"
+		  :data="form.productInfoList"
 		  border
 		>
 		  <el-table-column label="序号" align="center" width="60">
@@ -88,7 +88,7 @@
 		    <template slot-scope="scope">
 		      <el-form-item
 		          label-width="0px"
-		         :prop="'productInfoAddPos.'+ scope.$index + '.contractNum'"
+		         :prop="'productInfoList.'+ scope.$index + '.contractNum'"
 		         :rules="{
 		           required: true,
 		           message: '请输入交付数量',
@@ -133,14 +133,14 @@
     </template>
 	
 	<!-- 选择产品 -->
-	<EquipmentDialog ref="equipmentRefs" @choose="confirmChoose" :selectList="form.productInfoAddPos"> </EquipmentDialog>
+	<EquipmentDialog ref="equipmentRefs" @choose="confirmChoose" :selectList="form.productInfoList"> </EquipmentDialog>
   </ele-modal>
 </template>
 
 <script>
 	import { getCode } from '@/api/codeManagement';
 	import EquipmentDialog from '../components/EquipmentDialog.vue';
-	import { createOrUpdate  } from '@/api/saleOrder';
+	import { createOrUpdate , getOrderDetail  } from '@/api/saleOrder';
 	export default {
 		components: {
 		  EquipmentDialog
@@ -150,7 +150,7 @@
         visible: false,
 		loading:false,
 		form:{
-			productInfoAddPos:[]
+			productInfoList:[]
 		},
 	// 表单验证规则
 		rules: {
@@ -160,7 +160,8 @@
 			{id:1,label:'内销订单'},
 			{id:2,label:'外销订单'},
 			{id:3,label:'预制订单'}
-		]
+		],
+		title:'创建订单'
       };
     },
     computed: {
@@ -172,20 +173,32 @@
     created(){
     },
     methods: {
-	  open () {
+	  open (row) {
 	    this.visible = true;
-		this.getSaleCode()
+		if(row){
+			this.title = '修改订单'
+			this.getDetail(row.code)
+		}else{
+			this.title = '创建订单'
+			this.getSaleCode()
+		}
+	  },
+	  getDetail(code){
+		  getOrderDetail(code).then(res=>{
+			  console.log('返回',res)
+			  this.form = res
+		  })
 	  },
       cancel () {
 		this.form = {
-			productInfoAddPos:[]
+			productInfoList:[]
 		}
 		this.$refs.form.clearValidate();
         this.visible = false;
       },
 	  // 删除产品
 	  handleDeleteItem (index) {
-	    this.form.productInfoAddPos.splice(index, 1)
+	    this.form.productInfoList.splice(index, 1)
 		this.changeLineNumber()
 	  },
 	  addEquipment(){
@@ -197,7 +210,7 @@
 	      if (!valid) {
 	        return false;
 	      }
-		  if(!this.form.productInfoAddPos.length){
+		  if(!this.form.productInfoList.length){
 			  return this.$message.warning('产品列表不能为空！')
 		  }
 		  this.loading = true;
@@ -236,31 +249,31 @@
 			);
 			// 取出在弹窗中选中并且不在表格中的数据
 			 const result = list.filter(
-			   i => this.form.productInfoAddPos.findIndex(p => p.productCode === i.productCode) === -1
+			   i => this.form.productInfoList.findIndex(p => p.productCode === i.productCode) === -1
 			 )
 			 // 取出在表格中并且不在弹窗中选中的数据 即取消选中的数据
-			 const del = this.form.productInfoAddPos.filter(
+			 const del = this.form.productInfoList.filter(
 			   i => list.findIndex(p => p.productCode === i.productCode) === -1
 			 )
-			for(let i= this.form.productInfoAddPos.length-1;i>=0;i--){
+			for(let i= this.form.productInfoList.length-1;i>=0;i--){
 			  for(let j in del){
-				  if(this.form.productInfoAddPos[i].productCode === del[j].productCode){
-					  this.form.productInfoAddPos.splice(i,1);
+				  if(this.form.productInfoList[i].productCode === del[j].productCode){
+					  this.form.productInfoList.splice(i,1);
 				  }
 			  }
 			}
-			this.form.productInfoAddPos = this.form.productInfoAddPos.concat(result)
+			this.form.productInfoList = this.form.productInfoList.concat(result)
 			this.changeLineNumber()
 		},
 		
 		changeLineNumber(){
-			this.form.productInfoAddPos.map((item,index)=>{
+			this.form.productInfoList.map((item,index)=>{
 				item.lineNumber = 10*(index+1)
 			})
 		},
 		
 		inputNumber(row,index){
-			const pos = this.form.productInfoAddPos
+			const pos = this.form.productInfoList
 			if(pos[index].productUnitWeight){
 				this.$set(pos[index],'deliveryWeight', row.contractNum * row.productUnitWeight)
 			}

src/views/saleOrder/components/order-detail.vue

@@ -204,11 +204,12 @@
 </template>
 
 <script>
+	import { getOrderDetail  } from '@/api/saleOrder';
 	export default {
     data() {
       return {
         visible: false,
-		tableList:[]
+	    tableList:[]
       };
     },
     computed: {
@@ -218,7 +219,13 @@
     },
     methods: {
 	  open () {
-	    this.visible = true;
+		this.getDetail(row.code)
+		this.visible = true;
+	  },
+	  getDetail(code){
+		  getOrderDetail(code).then(res=>{
+			  console.log('返回',res)
+		  })
 	  },
       cancel () {
         this.visible = false;

src/views/saleOrder/index.vue

@@ -15,9 +15,9 @@
         cache-key="systemRoleTable"
 		    row-key="id"
       >
-		<template v-slot:name='{row}'>
+		<template v-slot:code='{row}'>
 			<el-link :underline="false" @click="openDetails(row)">
-			  {{ row.name }}
+			  {{ row.code }}
 			</el-link>
 		</template>
 		<!-- 操作列 -->
@@ -46,13 +46,15 @@
     </el-card>
 	<!-- 详情弹窗 -->
 	<order-detail @refresh="reload" ref="detailDialog"> </order-detail>
-
+    <!-- 创建订单 -->
+    <create-order ref="createDialog" @refresh="reload"> </create-order> 
   </div>
 </template>
 
 <script>
   import OrderSearch from './components/order-search.vue';
   import OrderDetail from './components/order-detail.vue';
+  import CreateOrder from './components/create-order.vue'
   import { getPageList  } from '@/api/saleOrder';
   import dictMixins from '@/mixins/dictMixins';
   
@@ -60,7 +62,8 @@
     mixins: [dictMixins],
     components: {
       OrderSearch,
-	  OrderDetail
+	  OrderDetail,
+	  CreateOrder
     },
     data () {
       return {
@@ -267,10 +270,10 @@
 		  // console.log('activeName',this.activeName);
 	  },
 	  openDetails(row){
-		  this.$refs.detailDialog.open()
+		  this.$refs.detailDialog.open(row)
 	  },
 	  toUpdate(row){
-		  
+		 this.$refs.createDialog.open(row) 
 	  },
 	  remove(row){
 		  

src/views/saleOrder/salesToProduction.vue

@@ -331,6 +331,7 @@
 	   confirmVersion(data){
 		   this.$set(this.form,'producteVersionName',data.produceVersionName)
 		   this.$set(this.form,'producteVersionId',data.produceVersionId)
+			this.form.productline = data.lineNames.length?data.lineNames[0]:''
 	   },
 	   
 	   confirmChoose(list){

vue.config.js

@@ -31,11 +31,11 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.38:8080', // 陈潇
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
-        target: 'http://192.168.3.33:8080', // 谢一平
+        // target: 'http://192.168.3.33:8080', // 谢一平
         // target: 'http://192.168.3.51:18086', // 测试环境
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域