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

src/views/BidSystem/DeepeningOrder/detail.vue

@@ -1105,7 +1105,8 @@ export default {
                 order_area_product_id,
               },
             }).then((res) => {
-              if (res.doce == 200) {
+              if (res.code == 200) {
+                this.getListData();
                 this.$Message.success(res.msg);
                 this.initData(
                   this.formData.order_no,

src/views/BidSystem/DeepeningOrder/info.vue

@@ -443,13 +443,13 @@
               ></Option>
             </Select> -->
           </template>
-          <template slot="supSet" slot-scope="{ row, index }">
-            <!-- <a
+          <!-- <template slot="supSet" slot-scope="{ row, index }">
+            <a
               style="margin: 0 5px; color: red"
               @click="handleSupSet(row, index)"
               >删除</a
-            > -->
-          </template>
+            >
+          </template> -->
         </Table>
       </div>
       <div class="modal-footer" slot="footer">
@@ -842,7 +842,7 @@ export default {
           align: "center",
           width: "120",
           slot: "set",
-        },
+        }
       ],
       productDetail: {},
       supTableColumns: [
@@ -1379,9 +1379,11 @@ export default {
                 order_area_product_id,
               },
             }).then((res) => {
-              if (res.doce == 200) {
+              if (res.code == 200) {
                 this.$Message.success(res.msg);
                 this.initData(this.formData.order_no, this.oa_id);
+                this.handleShowCurrencyArea(item,index)
+                this.getListData()
               }
             });
           },

src/views/BidSystem/DeepeningOrder/list.vue

@@ -60,13 +60,13 @@
         <div>
           <a
             style="margin: 0 5px"
-            :disabled="row.deep_status != 1"
+            :disabled="row._is_explode == 0"
             @click="handleSet(row, index, 1)"
             >下拆单</a
           >
           <a
             style="margin: 0 5px"
-            :disabled="row.deep_status != 1"
+            :disabled="row.deep_status == 2"
             @click="handleSet(row, index, 2)"
             >编辑</a
           >
@@ -387,6 +387,7 @@ export default {
     getData(row) {
       this.loading = true;
       this.axios("/api/order_area_deep_list", { params: row }).then((res) => {
+        console.log(res.data)
         this.loading = false;
         this.tableData = res.data.data;
         this.total = res.data.total;

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Toptitle :title="$route.query.type==1?'新增入库单':$route.query.type==2?'查看入库单':'编辑入库单'">
+    <Toptitle :title="$route.query.type==1?'新增入库单':$route.query.type==2?'入库单详情':'编辑入库单'">
       <slot name="titleButton">
         <Button @click="handleReference(5,1)"
                 type="primary"

src/views/PurchasingManage/OutstockOrder/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Toptitle :title="$route.query.type == 1 ? '新增出库单' : '编辑出库单'">
+    <Toptitle :title="$route.query.type == 1 ? '新增出库单' :$route.query.type == 2 ?'出库单详情':'编辑出库单'">
       <slot name="titleButton">
         <Button
           @click="handleReference(8, 1)"

src/views/PurchasingManage/PurchasingOrder/edit.vue

@@ -893,7 +893,6 @@ export default {
     handleProjectSelect () {
       this.searchData.residential_name = this.currentChoose.residential_name
       this.searchData.order_no = this.currentChoose.order_no
-      this.tableData[0].residential_name = this.currentChoose.residential_name
       this.tableData.map((item,index)=>{
         item.residential_name = this.currentChoose.residential_name
         this.tableData.splice(index,1,item)