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

src/api/saleOrder/index.js

@@ -1,115 +1,24 @@
 import request from '@/utils/request';
 
-/**
- * 获取当前登录的菜单、按钮权限
- */
-export async function getResourcesTree () {
-  const res = await request.get('/system/resources/getResourcesTree');
-  if (res.data.code == 0 && res.data.data) {
+
+// 生成编码
+export async function getCode (code) {
+  const res = await request.get(`/main/codemanage/getCode/` + code, {});
+  if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
+
 /**
- * 修改当前登录的用户密码
+ * 获取当前登录的菜单、按钮权限
  */
-export async function updatePassword (data) {
-  const res = await request.put('/auth/password', data);
-  if (res.data.code === 0) {
-    return res.data.message ?? '修改成功';
+export async function getResourcesTree () {
+  const res = await request.get('/system/resources/getResourcesTree');
+  if (res.data.code == 0 && res.data.data) {
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-/**
- * 查询未读通知
- */
-export async function getUnreadNotice () {
-  return {
-    notice: [
-      {
-        color: '#60B2FC',
-        icon: 'el-icon-s-comment',
-        title: '你收到了一封14份新周报',
-        time: '2020-07-27 18:30:18'
-      },
-      {
-        color: '#F5686F',
-        icon: 'el-icon-s-check',
-        title: '许经理同意了你的请假申请',
-        time: '2020-07-27 09:08:36'
-      },
-      {
-        color: '#7CD734',
-        icon: 'el-icon-video-camera',
-        title: '陈总邀请你参加视频会议',
-        time: '2020-07-26 18:30:01'
-      },
-      {
-        color: '#FAAD14',
-        icon: 'el-icon-s-claim',
-        title: '你推荐的刘诗雨已通过第三轮面试',
-        time: '2020-07-25 16:38:46'
-      },
-      {
-        color: '#2BCACD',
-        icon: 'el-icon-message-solid',
-        title: '你的6月加班奖金已发放',
-        time: '2020-07-25 11:03:31'
-      }
-    ],
-    letter: [
-      {
-        avatar:
-          'https://cdn.eleadmin.com/20200609/c184eef391ae48dba87e3057e70238fb.jpg',
-        title: 'SunSmile 评论了你的日志',
-        content: '写的不错, 以后多多向你学习~',
-        time: '2020-07-27 18:30:18'
-      },
-      {
-        avatar:
-          'https://cdn.eleadmin.com/20200609/948344a2a77c47a7a7b332fe12ff749a.jpg',
-        title: '刘诗雨 点赞了你的日志',
-        content: '写的不错, 以后多多向你学习~',
-        time: '2020-07-27 09:08:36'
-      },
-      {
-        avatar:
-          'https://cdn.eleadmin.com/20200609/2d98970a51b34b6b859339c96b240dcd.jpg',
-        title: '酷酷的大叔 评论了你的周报',
-        content: '写的不错, 以后多多向你学习~',
-        time: '2020-07-26 18:30:01'
-      },
-      {
-        avatar:
-          'https://cdn.eleadmin.com/20200609/f6bc05af944a4f738b54128717952107.jpg',
-        title: 'Jasmine 点赞了你的周报',
-        content: '写的不错, 以后多多向你学习~',
-        time: '2020-07-25 11:03:31'
-      }
-    ],
-    todo: [
-      {
-        status: 0,
-        title: '刘诗雨的请假审批',
-        description: '刘诗雨在 07-27 18:30 提交的请假申请'
-      },
-      {
-        status: 1,
-        title: '第三方代码紧急变更',
-        description: '需要在 2020-07-27 之前完成'
-      },
-      {
-        status: 2,
-        title: '信息安全考试',
-        description: '需要在 2020-07-26 18:30 前完成'
-      },
-      {
-        status: 2,
-        title: 'EleAdmin发布新版本',
-        description: '需要在 2020-07-25 11:03 前完成'
-      }
-    ]
-  };
-}

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

@@ -9,39 +9,39 @@
 		<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" disabled/>
+			     <el-input clearable :maxlength="20" v-model="form.code" disabled/>
 			  </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 dictName="紧急程度" clearable v-model="form.deliveryRequirements">
 			     </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 dictName="订单类型" clearable v-model="form.orderType">
 					</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 dictName="按单按库" clearable v-model="form.orderLibraryType">
 			  	</DictSelection>
 			  </el-form-item>
 			</el-col>
 			<el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
 			  <el-form-item label="客户名称:">
-			     <el-input clearable v-model="form.ddh"/>
+			     <el-input clearable v-model="form.customerName"/>
 			  </el-form-item>
 			</el-col>
 			<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
 			  <el-form-item label="业务员:">
-			     <el-input clearable v-model="form.ddh"/>
+			     <el-input clearable v-model="form.salesman"/>
 			  </el-form-item>
 			</el-col>
 			<el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-			  <el-form-item label="交付日期:" prop="date">
+			  <el-form-item label="交付日期:" prop="deliveryTime">
 			    <el-date-picker
 				   style="width: 100%;"
 				   v-model="form.date"
@@ -53,12 +53,12 @@
 			</el-col>
 			<el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
 			  <el-form-item label="备注:">
-			     <el-input clearable v-model="form.remrk"/>
+			     <el-input clearable v-model="form.notes"/>
 			  </el-form-item>
 			</el-col>
 		</el-row>
 		<el-table
-		  :data="form.tableList"
+		  :data="form.productInfoAddPos"
 		  border
 		>
 		  <el-table-column label="序号" align="center" width="60">
@@ -82,7 +82,7 @@
 		    <template slot-scope="scope">
 		      <el-form-item
 		          label-width="0px"
-		         :prop="'tableList.'+ scope.$index + '.num'"
+		         :prop="'productInfoAddPos.'+ scope.$index + '.num'"
 		         :rules="{
 		           required: true,
 		           message: '请输入交付数量',
@@ -128,6 +128,7 @@
 </template>
 
 <script>
+	import { getCode } from '@/api/saleOrder'
 	import EquipmentDialog from '../components/EquipmentDialog.vue'
 	export default {
 		components: {
@@ -136,24 +137,14 @@
     data() {
       return {
         visible: false,
-		tableList:[],
 		loading:false,
 		form:{
-			tableList:[
-				{name:'122',model:'型号1'},
-				{name:'222',model:'型号2'}
-			]
+			productInfoAddPos:[]
 		},
 	// 表单验证规则
 		rules: {
-				date: [
-					{
-						required: true,
-						message: '请选择交付日期',
-						trigger: 'change'
-					}
-				]
-			},
+			deliveryTime: [{required: true,message: '请选择交付日期',trigger: 'change'}]
+		},
       };
     },
     computed: {
@@ -167,17 +158,18 @@
     methods: {
 	  open () {
 	    this.visible = true;
+		this.getSaleCode()
 	  },
       cancel () {
 		this.form = {
-			tableList:[]
+			productInfoAddPos:[]
 		}
 		this.$refs.form.clearValidate();
         this.visible = false;
       },
 	  // 删除产品
 	  handleDeleteItem (index) {
-	    this.form.tableList.splice(index, 1)
+	    this.form.productInfoAddPos.splice(index, 1)
 	  },
 	  addEquipment(){
 		  this.$refs.equipmentRefs.open()
@@ -191,6 +183,13 @@
 	    });
 	  },
 	  
+	  async getSaleCode(){
+		const res = await getCode('sale_order')
+		if(res){
+			this.$set(this.form,'code',res)
+		}
+	  }
+	  
     }
   };
 </script>

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

@@ -79,16 +79,16 @@
 				{name:'222',model:'型号2'}
 			]
 		},
-		// 表单验证规则
-		rules: {
-		  date: [
-		    {
-		      required: true,
-		      message: '请选择交付日期',
-		      trigger: 'change'
-		    }
-		  ]
-		},
+			// 表单验证规则
+			rules: {
+				date: [
+					{
+						required: true,
+						message: '请选择交付日期',
+						trigger: 'change'
+					}
+				]
+			},
       };
     },
     computed: {