add:入库单主表处理：自定义入库单字段处理

wms_pro/qd/src/views/wms/sync_manage/form_mapping/AddDialog.vue

@@ -20,7 +20,7 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="表单结构表" prop="local_table_name">
+          <el-form-item label="表单结构表" prop="form_type">
             <el-select
               v-model="form.form_type"
               clearable
@@ -37,13 +37,13 @@
                   :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="表单名称" prop="api_address">
+          <el-form-item label="表单名称" prop="form_name">
             <el-input v-model="form.form_name" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="表单描述" prop="api_address">
+          <el-form-item label="表单描述" prop="form_desc">
             <el-input v-model="form.form_desc" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="接口地址" prop="api_address">
+          <el-form-item label="接口地址" prop="sync_url">
             <el-input v-model="form.sync_url" :disabled="!form.form_type" style="width: 180px;" />
           </el-form-item>
           <el-form-item label="同步类型" prop="sync_type">

wms_pro/qd/src/views/wms/sync_manage/form_mapping/EditDialog.vue

@@ -20,31 +20,20 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="映射表名" prop="local_table_name">
-            <el-select
-              v-model="form.local_table_name"
-              clearable
-              filterable
-              size="mini"
-              disabled
-              placeholder="请选择/搜索"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in tableNameList"
-                :value="item"
-              />
-            </el-select>
+          <el-form-item label="映射表类型" prop="form_type">
+             <el-input v-model="form.form_type" :disabled=true style="width: 180px;" />
           </el-form-item>
-          <el-form-item label="接口地址" prop="api_address">
-            <el-input v-model="form.api_address" :disabled="!form.local_table_name" style="width: 180px;" />
+          <el-form-item label="映射表名" prop="form_name">
+             <el-input v-model="form.form_name" :disabled=true style="width: 180px;" />
+          </el-form-item>
+          <el-form-item label="接口地址" prop="sync_url">
+            <el-input v-model="form.sync_url"  style="width: 180px;" />
           </el-form-item>
           <el-form-item label="同步类型" prop="sync_type">
             <el-select
               v-model="form.sync_type"
               class="filter-item"
               clearable
-              :disabled="!form.local_table_name"
               placeholder="请选择"
               style="width: 180px"
             >
@@ -63,7 +52,6 @@
               clearable
               placeholder="请选择"
               style="width: 180px"
-              :disabled="!form.local_table_name"
             >
               <el-option
                 v-for="item in dict.external_system"
@@ -77,9 +65,13 @@
         </el-form>
       </span>
     </div>
+    <el-tabs v-model="currentTab" class="center-tabs">
+      <el-tab-pane label="主表字段映射" name="mst" />
+      <el-tab-pane v-if='this.form.has_child' label="明细字段映射" name="dtl" />
+    </el-tabs>
     <el-table
       ref="table"
-      :data="tableData"
+      :data="currentTab==='mst'?tableData:tableDtlData"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       border
       highlight-current-row
@@ -93,14 +85,20 @@
             icon="el-icon-delete"
             size="mini"
             type="danger"
-            @click.native.prevent="deleteRow(scope.$index, tableData)"
+            @click.native.prevent="deleteRow(scope.$index, currentTab==='mst'?tableData:tableDtlData)"
           />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="字段名称" prop="local_field_name" />
-      <el-table-column align="center" label="外部系统字段名称" prop="external_field_name">
+      <el-table-column align="center" label="表单字段" prop="value" />
+      <el-table-column align="center" label="表单字段名称" prop="lable" />
+      <el-table-column align="center" label="外部系统映射字段" prop="mapping_field">
         <template scope="scope">
-          <el-input v-model="scope.row.external_field_name" size="mini" />
+          <el-input v-model="scope.row.mapping_field" size="mini" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="映射表达式" prop="skipExpression">
+        <template scope="scope">
+          <el-input v-model="scope.row.skipExpression" size="mini" />
         </template>
       </el-table-column>
     </el-table>
@@ -114,7 +112,7 @@
 <script>
 
 import CRUD, { crud, header, presenter } from '@crud/crud'
-import crudFormMapping from './formMapping'
+import crudFormMapping, {updateRows} from './formMapping'
 
 export default {
   name: 'EditDtl',
@@ -133,9 +131,11 @@ export default {
   },
   data() {
     return {
+      currentTab: 'mst',
       dialogVisible: false,
-      tableNameList: [],
-      tableData: []
+      tableData: [],
+      tableDtlData: [],
+
     }
   },
   watch: {
@@ -150,51 +150,82 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     open() {
-      this.getExistTableName()
-    },
-    getExistTableName() {
-      crudFormMapping.getExistTableName().then(res => {
-        this.tableNameList = res
-      })
     },
     setForm(row) {
-      this.form.id = row.id
-      this.form.local_table_name = row.local_table_name
-      this.form.api_address = row.api_address
-      this.form.sync_type = row.sync_type
-      this.form.external_system = row.external_system
-      this.getColumns(this.form.local_table_name)
+      const mappingJson = row.mapping_json
+      let mst_json = mappingJson[0]
+      const dtl_json = mappingJson[1]
+      crudFormMapping.tableColumns(row.form_type).then(res => {
+        this.form.id = res.id
+        this.form.form_name = res.form_name
+        this.form.form_type = res.form_type
+        this.form.form_desc = res.form_desc
+        this.form.sync_url = row.sync_url
+        this.form.sync_type = row.sync_type
+        this.form.external_system = row.external_system
+        this.form.has_child = res.has_child
+        this.tableData = res.item
+        this.tableDtlData = res.dtl_item
+        for (let i = 0; i < this.tableData.length; i++) {
+          ddd:
+          for (let j = 0; j < mst_json.length; j++) {
+            if (mst_json[j].value == this.tableData[i].value) {
+              this.$set(this.tableData, i,mst_json[j])
+              break ddd
+            }
+          }
+        }
+        for (let i = 0; i < this.tableDtlData.length; i++) {
+          ddd:
+            for (let j = 0; j < dtl_json.length; j++) {
+              if (dtl_json[j].value == this.tableDtlData[i].value) {
+                this.$set(this.tableDtlData, i,dtl_json[j])
+                // this.tableDtlData[i].mapping_field = dtl_json[j].mapping_field
+                // this.tableDtlData[i].skipExpression = dtl_json[j].skipExpression
+                break ddd
+              }
+            }
+        }
+      })
     },
     close() {
       this.$emit('update:dialogShow', false)
       this.$emit('EditChanged')
       this.tableData = []
+      this.tableDtlData = []
+      this.form = {}
+      this.currentTab = 'mst'
+      this.dialogVisible = false
     },
     deleteRow(index, rows) {
       rows.splice(index, 1)
     },
-    getColumns(local_table_name) {
-      crudFormMapping.getTableColumnNamesFromMapping(local_table_name).then(res => {
-        this.tableData = res.dtos
-      })
-    },
     submit() {
-      if (!this.form.local_table_name) {
-        this.crud.notify('映射表名不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+      if (!this.form.sync_url) {
+        this.crud.notify('接口地址不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-      const isInvalidRow = this.tableData.some(row => !row.external_field_name)
+      if (!this.form.sync_type) {
+        this.crud.notify('同步类型不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      const isInvalidRow = this.tableData.some(row => !row.mapping_field)
       if (isInvalidRow) {
         this.crud.notify('外部字段名称不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
+      const isdtlRow = this.tableDtlData.some(row => !row.mapping_field)
+      if (isdtlRow) {
+        this.crud.notify('外部字段名称不能为空!！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
       const requestData = {
-        'bmExternalFieldMapping': this.form,
-        'dtos': this.tableData
+        'mst': this.form,
+        'item': [this.tableData, this.tableDtlData]
       }
       crudFormMapping.updateRows(requestData)
       this.$emit('update:dialogShow', false)
-      this.$emit('EditChanged')
+      this.$emit('AddChanged')
     }
   }
 }

wms_pro/qd/src/views/wms/sync_manage/form_mapping/formMapping.js

@@ -48,8 +48,8 @@ export function addRows(data) {
 
 export function updateRows(data) {
   return request({
-    url: 'api/syncFormMapping/updateRows',
-    method: 'put',
+    url: 'api/syncFormMapping/update',
+    method: 'post',
     data
   })
 }