Merge branch 'dev_9.0.2' into dev

src/api/mes/md/sapFieldData.js

+import request from '@/utils/request'
+
+// 查询Sap特性视图详细
+export function get(params) {
+  return request({
+    url: '/md/sapFieldData/',
+    method: 'get',
+    params
+  })
+}
+
+// 查询Sap特性视图列表
+export function page(data) {
+  return request({
+    url: '/md/sapFieldData/page',
+    method: 'post',
+    data
+  })
+}
+
+// 查询Sap特性视图列表
+export function listView(query) {
+  return request({
+    url: '/md/sapFieldData/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询Sap特性视图列表
+export function listViewVo(query) {
+  return request({
+    url: '/md/sapFieldData/listVo',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增Sap特性视图
+export function addView(data) {
+  return request({
+    url: '/md/sapFieldData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改Sap特性视图
+export function updateView(data) {
+  return request({
+    url: '/md/sapFieldData',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除Sap特性视图
+export function delView(id) {
+  return request({
+    url: '/md/sapFieldData/' + id,
+    method: 'delete'
+  })
+}

src/views/mes/md/sapField/components/SapForm.vue

@@ -36,26 +36,26 @@ export default {
           this.loading = true
           let data = {}
           data.sapData = JSON.stringify(this.sapForm)
-          console.log(this.form)
           let handleEdit = this.form.id ? updateData : addData
           handleEdit(this.form).then(() => this.$message.success('操作成功')).finally(() => this.loading = false)
         }
       })
     },
-    init(type, relationId, data = { ITEM: [{ SIZE: [{}] }, { SIZE: [{}] }] }) {
-      console.log(type, relationId)
+    init(type, relationId, form, data) {
+      this.form = form || {type, relationId}
+      let sapData = form ? JSON.parse(form.sapData) : {}
       let params = { type, parentId: 0 }
       listViewVo(params).then(res => {
         this.sapFieldList = res.data
-        this.sapForm = this.initSapForm(res.data, data)
-        console.log(this.sapFieldList, this.sapForm)
+        this.sapForm = this.initSapForm(res.data, sapData, data)
+        console.log(this.sapFieldList, this.sapForm, type, relationId)
       })
     },
-    initSapForm(sapFieldList, data = {}) {
+    initSapForm(sapFieldList, sapData, data = {}) {
       let sapForm = {}
       for (let i = 0; i < sapFieldList.length; i++) {
         const item = sapFieldList[i]
-        let itemData = data[item.field]
+        let itemData = data[item.field] || sapData[item.sapField]
 
         if (item.dataType == 9) {
           sapForm[item.sapField] = this.initSapForm(item.children, itemData || {})

src/views/mes/order/sales/OrderSync.vue

+<template>
+  <div class="OrderSync">
+    <div class="page-head">
+      <div class="page-title">同步销售订单</div>
+      <div class="head-btn">
+        <el-button size="mini" @click="onGoBack">返回</el-button>
+        <el-button type="primary" size="mini" :loading="loading" @click="onEdit">提交</el-button>
+      </div>
+    </div>
+    <div class="page-body">
+      <SapForm ref="sapForm"/>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getOrder, getSapInfo } from '@/api/mes/od/salesOrder'
+import { get as getSapData } from '@/api/mes/md/sapFieldData'
+import SapForm from '@/views/mes/md/sapField/components/SapForm'
+export default {
+  components: {
+    SapForm
+  },
+  data() {
+    return {
+      loading: false,
+      sapInfo: {
+        ITEM: []
+      }
+    }
+  },
+  methods: {
+    onEdit() {
+      this.$confirm("确定同步该条数据记录").then(() => {
+        if (this.loading) return
+        this.loading = true
+        let sapForm = this.$refs.sapForm.sapForm
+          syncSapData(sapForm).then(() => {
+            this.onGoBack()
+            this.$message.success("操作成功")
+          }).finally(() => this.loading = false)
+      })
+    },
+
+
+    onGoBack() {
+      this.$store.dispatch('tagsView/delView', this.$router.currentRoute)
+      this.$router.push('/order/sales')
+    },
+    onGetSapInfo() {
+      let id = this.$route.query.id
+      if (id) {
+        getSapData({type: 3, relationId: id}).then(res => {
+          let sapData = res.data
+          getOrder(id).then(resp => {
+            this.$refs.sapForm.init(3, id, sapData, resp.data)
+          })
+        })
+
+      }
+    },
+  },
+  created() {
+    this.onGetSapInfo()
+  }
+}
+</script>
+
+<style scoped>
+.page-head {
+  border-bottom: 1px solid #dddddd;
+  box-shadow: 0 2px 2px #dddddd;
+}
+
+.page-title {
+  line-height: 50px;
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.head-btn {
+  margin: 0 20px 20px;
+}
+
+.page-body {
+  margin: 20px 20px 100px;
+}
+</style>

src/views/mes/order/salesdetail/index.vue

@@ -12,8 +12,7 @@
         <el-row class="form-row" :gutter="10">
           <el-col :span="6">
             <el-form-item label="订单编号" prop="orderNo">
-              <el-input v-model="form.orderNo" placeholder="请输入 订单编号" clearable style="width: calc(100% - 90px);"/>
-              <el-button @click="onGenCode" style="width: 80px; margin-left: 10px" :disabled="!!form.id">生成</el-button>
+              <el-input v-model="form.orderNo" placeholder="请输入订单编号" readonly/>
             </el-form-item>
           </el-col>
           <el-col :span="6">