Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

# Conflicts:
#	src/views/OrderMannage/BusinessOrderlist/edit.vue
1

src/views/BidSystem/DeepeningOrder/infoDetail.vue

@@ -1105,7 +1105,7 @@ export default {
 .changeDetail {
   .content {
     overflow: auto;
-    height: 680px;
+    height: 90%;
     .form_content {
       display: flex;
       flex-wrap: wrap;

src/views/OrderMannage/BusinessOrderlist/edit.vue

@@ -11,6 +11,20 @@
         style="margin-right: 10px"
         >打印</Button
       >
+      <Button
+        @click="quoteRoughDraft"
+        type="primary"
+        v-show="type == 1"
+        style="margin-right: 10px"
+        >引用草稿</Button
+      >
+      <Button
+        @click="saveRoughDraft"
+        type="primary"
+        v-show="type == 1"
+        style="margin-right: 10px"
+        >保存草稿</Button
+      >
       <Button @click="back" type="primary" ghost style="margin-right: 10px"
         >返回</Button
       >
@@ -2551,6 +2565,39 @@ export default {
     });
   },
   methods: {
+    quoteRoughDraft() {
+      this.axios
+        .post("/api/update/get_table", {
+          id: "businessorderlist_detail_roughDraft",
+        })
+        .then((res) => {
+          this.post_formSetTableData = res.data.table.post_formSetTableData;
+          this.info = res.data.table.info;
+          this.formSetTableData = res.data.table.formSetTableData;
+          this.handleClientChargeChange(res.data.table.info.custom_detail_name);
+          this.tableData = res.data.table.tableData;
+        });
+    },
+    saveRoughDraft() {
+      this.axios({
+        method: "post",
+        url: "/api/update/table",
+        data: {
+          id: "businessorderlist_detail_roughDraft",
+          result: {
+            post_formSetTableData: this.post_formSetTableData,
+            info: this.info,
+            formSetTableData: this.formSetTableData,
+            tableData: this.tableData,
+          },
+        },
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$Message.success(res.msg);
+          // this.initData(this.order_no);
+        }
+      });
+    },
     print_line() {
       this.axios({
         method: "get",
@@ -2642,12 +2689,14 @@ export default {
       let _save_metal = this.tableData.filter(
         (v) => v.is_metal && v.product_id
       );
+      // console.log(_save_metal)
       _save_metal.length > 0 &&
         _save_metal.map((v) => {
           v.type = 1;
           v.material_id = v.product_id;
           v.ext_id = v.product_id;
         });
+      console.log(sendList);
       sendList.length > 0 &&
         sendList.map((element, index) => {
           element.ext = element.extArray;
@@ -2662,6 +2711,7 @@ export default {
               });
             }
           });
+          console.log(2);
           if (!element.measurement) {
             element.measurement = "";
           }