Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/AdditionalOrder.vue

@@ -0,0 +1,132 @@
+<template>
+  <ele-modal
+    :visible.sync="visible"
+    title="追加订单"
+    width="75vw"
+    append-to-body
+  >
+    <el-form ref="form" :model="form"  label-width="90px">
+		<el-row :gutter="15">
+			<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+			  <el-form-item label="销售订单号:">
+			     <el-input clearable :maxlength="20" v-model="form.ddh"/>
+			  </el-form-item>
+			</el-col>
+			<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+			  <el-form-item label="订单类型:">
+					<DictSelection dictName="订单类型" clearable v-model="form.staus">
+					</DictSelection>
+			  </el-form-item>
+			</el-col>
+			<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+			  <el-form-item label="按单按库:">
+			  	<DictSelection dictName="按单按库" clearable v-model="form.staus">
+			  	</DictSelection>
+			  </el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+	<el-table
+	  :data="tableList"
+	  border
+	>
+	  <el-table-column label="序号" align="center" width="60">
+		<template slot-scope="scope">
+		  <span>{{ scope.$index + 1 }}</span>
+		</template>
+	  </el-table-column>
+	  <el-table-column label="销售订单号" align="center" prop="name">
+	  </el-table-column>
+	  <el-table-column label="行号" align="center" prop="name">
+	  </el-table-column>
+	  <el-table-column label="合同数量" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="合同重量" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="按单按库" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="订单类型" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="交付日期" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="下达日期" align="center" prop="measuringUnit">
+	  </el-table-column>
+	  <el-table-column label="客户名称" align="center" prop="measuringUnit">
+	  </el-table-column>
+	  <el-table-column label="业务员" align="center" prop="measuringUnit">
+	  </el-table-column>
+	  <el-table-column label="交付要求" align="center" prop="measuringUnit">
+	  </el-table-column>
+	  <el-table-column type="selection" align="center">
+	  </el-table-column>
+	</el-table>
+
+    <template v-slot:footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="save" :loading="loading">
+        确定
+      </el-button>
+    </template>
+  </ele-modal>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+        visible: false,
+		tableList:[],
+		loading:false,
+		form:{
+			tableList:[
+				{name:'122',model:'型号1'},
+				{name:'222',model:'型号2'}
+			]
+		},
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    created(){
+    },
+    methods: {
+	  open () {
+	    this.visible = true;
+	  },
+      cancel () {
+		this.form = {}
+		this.$refs.form.clearValidate();
+        this.visible = false;
+      },
+	  /* 保存编辑 */
+	  save() {
+	    this.$refs.form.validate((valid) => {
+	      if (!valid) {
+	        return false;
+	      }
+	    });
+	  },
+	  
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .basic-details-title{
+	  margin:10px 0
+  }
+  .add-product{
+	  width:100%;
+	  display:flex;
+	  align-items:center;
+	  justify-content:flex-end;
+	  font-size:30px;
+	  color:#1890ff;
+	  margin:10px 0;
+	  cursor: pointer;
+  }
+</style>
+

src/views/saleOrder/components/ProductionVersion.vue

@@ -0,0 +1,95 @@
+<template>
+  <ele-modal
+    :visible.sync="visible"
+    title="选择生产版本"
+    width="75vw"
+    append-to-body
+  >
+	<el-table
+	  :data="tableData"
+	  border
+	  ref="tableData"
+	  @row-click="single"
+	>
+	  <el-table-column label="生产版本" align="center" prop="name">
+	  </el-table-column>
+	  <el-table-column label="未完成工单数量" align="center" prop="name">
+	  </el-table-column>
+	  <el-table-column label="未成型数量" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="预计完成时间" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="标准产能" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="原料库存" align="center" prop="model">
+	  </el-table-column>
+	  <el-table-column label="改型仓" align="center" prop="model">
+	  </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>
+		   </template>
+	  </el-table-column>
+	</el-table>
+    <template v-slot:footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="save" :loading="loading">
+        确定
+      </el-button>
+    </template>
+  </ele-modal>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+        visible: false,
+		tableData:[
+			{id:1,name:'122',model:'型号1'},
+			{id:2,name:'222',model:'型号2'}
+		],
+		loading:false,
+	    radio: '',
+      };
+    },
+    computed: {
+    },
+    created(){
+    },
+    methods: {
+	  open () {
+	    this.visible = true;
+	  },
+      cancel () {
+        this.visible = false;
+		this.radio = ''
+      },
+	  // 单击获取id
+	  single (row) {
+	       this.radio = row.id;
+	  },
+	  /* 保存编辑 */
+	  save() {
+	     console.log('this.radio',this.radio)
+		 this.visible = false;
+	  },
+	  
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .basic-details-title{
+	  margin:10px 0
+  }
+  .add-product{
+	  width:100%;
+	  display:flex;
+	  align-items:center;
+	  justify-content:flex-end;
+	  font-size:30px;
+	  color:#1890ff;
+	  margin:10px 0;
+	  cursor: pointer;
+  }
+</style>

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

@@ -206,7 +206,6 @@
 	  font-size:30px;
 	  color:#1890ff;
 	  margin:10px 0;
-	  cursor: pointer
-;
+	  cursor: pointer;
   }
 </style>

src/views/saleOrder/salesToProduction.vue

@@ -20,7 +20,7 @@
 				</el-col>
 				<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
 				  <el-form-item label="生产版本:" prop="edition">
-				     <el-input placeholder="请选择生产版本" readonly v-model="form.edition"></el-input>
+				     <el-input @click.native="openVersion" placeholder="请选择生产版本" readonly v-model="form.edition"></el-input>
 				  </el-form-item>
 				</el-col>
 				<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -121,7 +121,7 @@
 			  </el-table-column>
 			  <el-table-column label="交付日期" align="center" prop="measuringUnit">
 			  </el-table-column>
-			  <el-table-column label="要求成型日期" align="center" prop="date"  width="150">
+			  <el-table-column label="要求成型日期" align="center" prop="date"  width="180">
 				  <template slot-scope="scope">
 				    <el-form-item
 				        label-width="0px"
@@ -166,14 +166,29 @@
 			    </template>
 			  </el-table-column>
 			</el-table>
+			<div class="add-product" @click='addEquipment'>
+				<i class="el-icon-circle-plus-outline"></i>
+			</div>
+			<el-row :gutter="24">
+				<el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
+				  <el-form-item label="计划备注:">
+					  <el-input type="textarea" :rows="4" v-model="form.remark" resize='none'></el-input>
+				  </el-form-item>
+				</el-col>
+			</el-row>
 		</el-form>
-     
+       <AdditionalOrder ref="additionalRefs"></AdditionalOrder>
+	   <ProductionVersion ref="versionRefs"></ProductionVersion>
     </el-card>
   </div>
 </template>
 <script>
+  import AdditionalOrder from './components/AdditionalOrder.vue';
+  import ProductionVersion from './components/ProductionVersion.vue'
   export default {
     components: {
+		AdditionalOrder,
+		ProductionVersion
     },
     data () {
       return {
@@ -230,6 +245,16 @@
 	       n.sort = index + 1;
 	     });
 	   },
+	   // 删除产品
+	   handleDeleteItem (index) {
+	     this.form.tableData.splice(index, 1)
+	   },
+	   addEquipment(){
+		   this.$refs.additionalRefs.open()
+	   },
+	   openVersion(){
+		  this.$refs.versionRefs.open() 
+	   }
     }
   };
 </script>
@@ -265,4 +290,14 @@
 	    color: #157a2c;
 	  }
 	}
+	.add-product{
+		  width:100%;
+		  display:flex;
+		  align-items:center;
+		  justify-content:flex-end;
+		  font-size:30px;
+		  color:#1890ff;
+		  margin:10px 0;
+		  cursor: pointer;
+	}
 </style>