新增复制订单

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/front/dto/CreateSaleOrderDTO.java

@@ -109,6 +109,12 @@ public class CreateSaleOrderDTO implements Serializable {
      */
     private String currency;
 
+    /**
+     * 订单方式
+     */
+    private String type;
+
+
     /**
      * 驳回原因
      */

hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue

@@ -112,7 +112,7 @@
       <el-table-column label="编码" align="center" prop="number" width="120"/>
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="公司" align="center" prop="company" />
-      <el-table-column label="邮箱" align="center" prop="email" />
+      <el-table-column label="邮箱" align="center" prop="email" width="150"/>
       <el-table-column label="联系人" align="center" prop="contacts" />
       <el-table-column label="联系人手机号" align="center" prop="phone" width="120"/>
       <el-table-column label="所属地区" align="center" prop="areaId" />

hangtag-ui/hangtag-ui-front/src/locales/en.ts

@@ -492,6 +492,7 @@ export default {
     waitAudit:'Wait Audit',
     waitArrange:'Wait Arrange',
     planned:'Planned',
+    copy:'copy',
     edit:'edit',
     details:'details',
     operate:'operate',

hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts

@@ -487,6 +487,7 @@ export default {
     waitAudit:'待审核',
     waitArrange:'待排产',
     planned:'已排产',
+    copy:'复制',
     edit:'编辑',
     details:'详情',
     operate:'操作',

hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue

@@ -479,6 +479,7 @@ const list = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   id: null,
+  type: null,
   pageNo: 1,
   pageSize: 10,
   name: null,
@@ -545,7 +546,7 @@ const formData = ref({
   rejectReason: '',
 })
 const isEditState = computed(() => {
-  return route.query.id != undefined
+  return route.query.id != undefined && route.query.type == undefined
 })
 const formRules = reactive({
   contactName: [{required: true, message: t('createOrder.ruleMsgContactName'), trigger: 'blur'}],
@@ -694,8 +695,10 @@ const submitPreHandler = (showMsg = true) => {
 const addNewBill = () => {
   console.log("stepRef.value.getTableData()", stepRef.value.getTableData())
   submitPreHandler().then(res => {
+    formData.value.type = queryParams.type
     console.log("formData222", formData.value)
-    if (formData.value.id) {
+    debugger;
+    if (formData.value.id && formData.value.type==undefined) {
       SaleOrderApi.editOrder(formData.value.id, {
         ...formData.value
       }).then(res => {
@@ -723,10 +726,10 @@ const addNewBill = () => {
         useMessage().warning("Error：" + e.message ? e.message : e)
       })
     } else {
+      formData.value.id = null
       SaleOrderApi.placeOrder({
         ...formData.value
       }).then(res => {
-
         useMessage().confirm(t('createOrder.tipsLoadingOrderCompleted'),{
           confirmButtonText: t('createOrder.backHome'),
           cancelButtonText: t('createOrder.viewOrder'),
@@ -764,6 +767,7 @@ onMounted(() => {
   queryParams.id = '';
   if (route.query) {
     queryParams.id = route.query.id ?? ''
+    queryParams.type = route.query.type ?? ''
   }
 
 })
@@ -831,6 +835,10 @@ onMounted(async () => {
       ...formData.value,
       id: queryParams.id
     }
+    if(queryParams.type!= undefined){
+      formData.value.contractCode = null;
+    }
+
     console.log("res.saleOrderEntry",res.saleOrderEntry)
     stepRef.value.init(res.saleOrderEntry ?? []);
   }

hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue

@@ -233,9 +233,16 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column :label="t('billlist.operate')" align="center" width="150" fixed="right">
+      <el-table-column :label="t('billlist.operate')" align="center" width="230" fixed="right">
         <template #default="scope">
-
+          <router-link  :to="'/order/createorder?id='+scope.row.id+'&type=copyAdd&_t=2'" >
+            <el-button
+              link
+              type="primary">
+              <Icon icon="ep:copydocument" />
+              {{t('billlist.copy')}}
+            </el-button>
+          </router-link>
           <router-link  :to="'/order/createorder?id='+scope.row.id+'&_t=2'" v-if="scope.row.billStatus == 'B' ">
             <el-button
               link