修改bug

src/api/tirePartsMall/salesManagement/outboundTask.js

@@ -27,3 +27,11 @@ export const outboundWorkOrder = (ids) => {
     }
   })
 }
+//修改
+export const typeSave = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/edit',
+    method: 'post',
+    data: data
+  })
+}

src/api/tirePartsMall/salesManagement/outboundWorkOrder.js

@@ -47,3 +47,11 @@ export const warehousingComplete = (data) => {
     data: data
   })
 }
+//撤销出库
+export const revokeOutboundCompleted = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/revokeOutboundCompleted',
+    method: 'POST',
+    data: data
+  })
+}

src/router/views/index.js

@@ -2490,7 +2490,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
-    name: '出库工单(L)',
+    name: '出库工单',
     meta: {
       i18n: '/tirePartsMall/salesManagement/outboundWorkOrder/index',
       keepAlive: true,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2736,18 +2736,27 @@ export default {
           delete list[item].updateUser
           delete list[item].updateUserName
           this.maxGoodsNum++
-          this.$refs.crudContact.rowCellAdd(list[item]);
-          getPurchasePrice({code:list[item].code }).then(rest => {
-            console.log(rest);
+          getPurchasePrice({ code: list[item].code }).then(rest => {
             if (rest.data.data.length > 0) {
-              this.$refs.crudContact.list[item].purchaseRebatePrice =  rest.data.data[0].purchaseRebatePrice
-              // this.$set(list[item], 'purchaseRebatePrice', rest.data.data[0].purchaseRebatePrice)
-            }else{
-              // this.$set(list[item], 'purchaseRebatePrice', 0)
-              this.$refs.crudContact.list[item].purchaseRebatePrice =  rest.data.data[0].purchaseRebatePrice
+              console.log('rest>>>1', rest);
+              // this.$refs.crudContact.list[item].purchaseRebatePrice =  rest.data.data[0].purchaseRebatePrice
+              // this.$set(this.$refs.crudContact.list[this.$refs.crudContact.list.length-1],'purchaseRebatePrice',rest.data.data[0].purchaseRebatePrice)
+              this.$set(list[item], 'purchaseRebatePrice', rest.data.data[0].purchaseRebatePrice)
+
+              console.log('>>>', list);
+            } else {
+              console.log('rest>>>2', rest);
+              this.$set(this.$refs.crudContact.list[this.$refs.crudContact.list.length - 1], 'purchaseRebatePrice', 0)
+              // this.$refs.crudContact.list[item].purchaseRebatePrice = 0
 
             }
           })
+          this.$refs.crudContact.rowCellAdd(list[item]);
+          console.log('rest>>>', this.$refs.crudContact);
+
+
+          console.log('rest>>>3', item);
+
           console.log(this.$refs.crudContact);
           this.$nextTick(() => {
             this.quantityChange(list[item])
@@ -2961,7 +2970,7 @@ export default {
     async editCustomer(isBack = false, type, other) {
       this.$refs["form"].validate(async (valid) => {
         if (valid) {
-          console.log(this.goodsShowData)
+          console.log(this.contactsData)
           const length = this.goodsActives === 'gift' ? this.contactsData.length : this.goodsShowData.length
           const length1 = this.goodsActives === 'goods' ? this.giftData : this.goodsShowData
           for (let i = 0; i < length; i++) {
@@ -2985,6 +2994,7 @@ export default {
           if (Number(this.form.pointMutiple) < Number(integral)) return this.$message.error('积分余额不足')
           //商品信息
           if (this.goodsActives == 'gift') {
+            console.log(this.form.orderItemsList);
             this.form.orderItemsList = this.goodsShowData.concat(this.contactsData)
           } else {
             this.form.orderItemsList = this.goodsShowData.concat(this.giftData)

src/views/exportTrade/purchaseContract/config/mainList.json

@@ -24,6 +24,15 @@
       "overHidden": true
     },
     {
+      "label": "销售订单号",
+      "prop": "srcOrderNo",
+      "search": true,
+      "searchSpan": 8,
+      "index": 3.1,
+      "minWidth": 100,
+      "overHidden": true
+    },
+    {
       "label": "采购日期",
       "prop": "businesDate",
       "search": true,
@@ -44,15 +53,6 @@
       "overHidden": true
     },
     {
-      "label": "销售订单号",
-      "prop": "srcOrderNo",
-      "search": true,
-      "searchSpan": 8,
-      "index": 3.1,
-      "minWidth": 100,
-      "overHidden": true
-    },
-    {
       "label": "预交日期",
       "prop": "plannedDeliveryDate",
       "search": true,

src/views/exportTrade/purchaseContract/index.vue

@@ -264,7 +264,8 @@ export default {
     data() {
         return {
             search: {
-                businesDate: defaultDate()
+                // businesDate: defaultDate()
+                // businesDate: ''
             },
             treeData: [],
             avueTree: false,

src/views/exportTrade/salesContract/config/mainList.json

@@ -26,6 +26,14 @@
       "searchSpan": 8
     },
     {
+      "label": "销售订单号",
+      "prop": "orderNo",
+      "minWidth": 100,
+      "overHidden": true,
+      "search": true,
+      "searchSpan": 8
+    },
+    {
       "label": "订单日期",
       "prop": "businesDate",
       "search": true,
@@ -35,14 +43,7 @@
       "type": "date",
       "format": "yyyy-MM-dd"
     },
-    {
-      "label": "销售订单号",
-      "prop": "orderNo",
-      "minWidth": 100,
-      "overHidden": true,
-      "search": true,
-      "searchSpan": 8
-    },
+
     {
       "label": "预交日期",
       "prop": "plannedDeliveryDate",

src/views/exportTrade/salesContract/index.vue

@@ -200,7 +200,7 @@ export default {
             dialogVisible: false,
             purchaseStatusList: [],
             search: {
-                businesDate: defaultDate()
+                // businesDate: defaultDate()
             },
             form: {},
             option: {},

src/views/tirePartsMall/basicData/accountManagement/index.vue

@@ -18,8 +18,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList', 265)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除
+          <el-button :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除
           </el-button>
         </template>
         <template slot="status" slot-scope="{row,index,disabled}">
@@ -128,7 +128,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/basicData/brandPage/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',272)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除
+          <el-button :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除
           </el-button>
         </template>
         <template slot="corpNameSearch">
@@ -71,7 +71,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -119,6 +119,7 @@ export default {
             option: {
                 menuBtn: false,
                 labelWidth: 100,
+                disabled:false,
                 column: [
                     {
                         label: "名称",
@@ -571,11 +572,19 @@ export default {
         },
         disabled(val) {
             disabled({ id: this.form.id, enableOrNot: val }).then(res => {
+                
                 this.$message({
                     type: "success",
                     message: val ? '禁用成功' : '启用成功'
                 });
                 this.getDetail(this.detailData.id);
+                if(val == 1){
+                    console.log('禁用中');
+                    this.option.disabled = false;
+                    for (let item of this.option.column) {
+                        this.$set(item,'disabled',false)
+                    }
+                }
             })
         },
         saveGoodstype() {
@@ -626,14 +635,19 @@ export default {
                 if (this.form.modifiable == 0) {
                     console.log(this.form.modifiable, '0');
                     for (let item of this.option.column) {
-                        item.disabled = true
+                        this.$set(item,'disabled',true)
                     }
                 } else if (this.form.modifiable == 1) {
-                    // console.log(this.form.modifiable, '1');
+                    console.log(this.form.modifiable, '1');
                     for (let item of this.option.column) {
                         item.disabled = false
                     }
                 }
+                if(this.form.enableOrNot == 1){
+                    for (let item of this.option.column) {
+                        this.$set(item,'disabled',false)
+                    }
+                }
                 this.key++
             }).finally(() => {
                 this.loadingBtn = false;

src/views/tirePartsMall/basicData/commodityInformation/index.vue

@@ -28,9 +28,11 @@
               </span>
             </template>
             <template slot-scope="{ row, index }" slot="menu">
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <i class="tradingIcon icon-del" @click.stop="rowDel(row, index)" v-if="row.status != 0" />
-              </el-tooltip>
+              <!-- <el-button  :size="small" :type="text"
+              @click.stop="rowDel(row, index)" v-if="row.status != 0">删除</el-button> -->
+              <!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <i class="tradingIcon icon-del"  />
+              </el-tooltip> -->
               <!-- <el-tooltip class="item" effect="dark" content="新建销售订单" placement="top">
             <i class="tradingIcon icon-add" />
           </el-tooltip>
@@ -52,6 +54,9 @@
           <el-button type="text" size="small" @click.stop="rowDel(row, index)">
             删除
           </el-button> -->
+          <el-button type="text" size="small" @click.stop="rowDel(row, index)" v-if="row.status != 0">
+            删除
+          </el-button>
             </template>
           </avue-crud>
         </el-col>

src/views/tirePartsMall/basicData/customerInformation/index.vue

@@ -37,8 +37,8 @@
               </el-date-picker>
             </template>
             <template slot-scope="{type,size, row, index }" slot="menu">
-              <el-button icon="el-icon-view" :size="size" :type="type" @click="editOpen(row, 2)">编辑</el-button>
-              <el-button icon="el-icon-delete" :size="size" :type="type" @click.stop="rowDel(row)">删除</el-button>
+              <el-button :size="size" :type="type" @click="editOpen(row, 2)">编辑</el-button>
+              <el-button :size="size" :type="type" @click.stop="rowDel(row)">删除</el-button>
             </template>
           </avue-crud>
         </el-col>

src/views/tirePartsMall/basicData/customerInformation/js/optionList.js

@@ -16,7 +16,7 @@ export const option = {
   viewBtn: false,
   editBtn: false,
   delBtn: false,
-  menuWidth: 140,
+  menuWidth: 100,
   searchIcon: true,
   searchIndex: 2,
   column: [

src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -22,7 +22,7 @@
               <avue-ueditor v-model="form.detailsText" :options="optionsUeditor"></avue-ueditor>
             </template>
             <template slot-scope="{type,size,row,index}" slot="menu">
-              <el-button icon="el-icon-edit" :size="size" :type="type" @click="$refs.crud.rowEdit(row, index)">编辑
+              <el-button :size="size" :type="type" @click="$refs.crud.rowEdit(row, index)">编辑
               </el-button>
               <el-tooltip :content="`${row.upAndDownShelves == 0?'上架':'下架'}`" placement="top">
                 <el-switch
@@ -154,7 +154,7 @@ export default {
         height: "auto",
         searchMenuPosition: "right",
         align: "center",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -22,7 +22,7 @@
               <avue-ueditor v-model="form.detailsText" :options="optionsUeditor"></avue-ueditor>
             </template>
             <template slot-scope="{type,size,row,index}" slot="menu">
-              <el-button icon="el-icon-edit" :size="size" :type="type" @click="$refs.crud.rowEdit(row, index)">编辑
+              <el-button :size="size" :type="type" @click="$refs.crud.rowEdit(row, index)">编辑
               </el-button>
               <el-tooltip :content="`${row.upAndDownShelves == 0?'上架':'下架'}`" placement="top">
                 <el-switch
@@ -153,7 +153,7 @@ export default {
         height: "auto",
         searchMenuPosition: "right",
         align: "center",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/basicData/supplier/index.vue

@@ -17,8 +17,8 @@
             @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 262)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 262)" :page.sync="page">
             <template slot-scope="{type,size,row,index}" slot="menu">
-              <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-              <el-button icon="el-icon-delete" :size="size" :type="type"
+              <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+              <el-button  :size="size" :type="type"
                 @click="$refs.crud.rowDel(row, index)">删除</el-button>
             </template>
             <!-- <template slot="enableOrNot" slot-scope="{row,index,disabled}">
@@ -154,7 +154,7 @@ export default {
         Height: '50',
         searchMenuPosition: "right",
         size: "small",
-        menuWidth: 120,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/financialManagement/collectionSettlement/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',267)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button  :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -70,7 +70,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/financialManagement/paymentSettlement/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',266)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -70,7 +70,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',270)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button  :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>
@@ -68,7 +68,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -5,12 +5,13 @@
         ref="crud" :key="key" @selection-change="selectionChange" @on-load="onLoad" @search-change="searchChange"
         @row-del="rowDel" @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 271)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 271)" :page.sync="page">
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 271)" :page.sync="page"
+        @row-update="rowUpdate">
         <template slot-scope="{type,size,row,index}" slot="menu" >
           <!--<el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>-->
           <el-button type="text" size="small" @click="rowCell(row, index)">{{ row.$cellEdit ? '保存' : '修改' }}
           </el-button>
-          <el-button icon="el-icon-delete" :disabled="row.statusName === '已派工'" :size="size" :type="type"
+          <el-button :disabled="row.statusName === '已派工'" :size="size" :type="type"
             @click="$refs.crud.rowDel(row, index)">删除
           </el-button>
         </template>
@@ -31,7 +32,7 @@
 </template>
 
 <script>
-import { getList, remove, outboundWorkOrder } from "@/api/tirePartsMall/salesManagement/outboundTask";
+import { getList, remove, outboundWorkOrder,typeSave } from "@/api/tirePartsMall/salesManagement/outboundTask";
 import da from "element-ui/src/locale/lang/da";
 // import detailsPage from "./detailsPage"
 
@@ -72,7 +73,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 80,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,
@@ -114,7 +115,7 @@ export default {
         },
         {
           label: '来源公司',
-          prop: "sourceCompanyId",
+          prop: "sourceCompanyName",
           search: true,
           width: 100,
           overHidden: true,
@@ -262,6 +263,18 @@ export default {
       }
       this.onLoad(this.page, this.search)
     },
+    //列表更新
+    rowUpdate(form, index, done) {
+      console.log(form);
+      typeSave(form).then(res => {
+        this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
+        // this.page.currentPage = 1;
+        // this.onLoad(this.page);
+        //成功关闭此页面回到列表页
+        // this.backToList()
+      })
+      done()
+    },
     //刷新
     refreshChange() {
       this.onLoad(this.page, this.search)
@@ -313,6 +326,7 @@ export default {
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
+      console.log(2132);
       /**
        * 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -10,9 +10,12 @@
         <!--        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"-->
         <!--                   @click="confirmEditing">编辑-->
         <!--        </el-button>-->
-        <el-button class="el-button--small-yh" type="primary" size="small" @click="editCustomer">保存数据
+        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName !== '已出库'"
+          @click="revoke">撤销出库
         </el-button>
-        <el-button class="el-button--small-yh" type="success" size="small" v-if="form.statusName == '待出库'"
+        <el-button class="el-button--small-yh" type="primary" size="small" @click="editCustomer" v-if="form.statusName !== '已出库'">保存数据
+        </el-button>
+        <el-button class="el-button--small-yh" type="success" size="small" v-if="form.statusName == '待出库' || form.statusName == '撤销出库'"
           @click="complete">出库完成
         </el-button>
       </div>
@@ -32,11 +35,11 @@
                 <el-button type="primary" icon="el-icon-printer" size="small" @click="handlePrint">打印</el-button>
               </template>
               <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                <el-button :size="size" :disabled="disabled" :type="type"
+                <el-button :size="size" :disabled="disabled || isAddDisabled" :type="type"
                   :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                   @click="$refs.formContacts.rowEdit(row, index)">编辑
                 </el-button>
-                <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
+                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled" :type="type"
                   @click="rowDelBox(row, index)">删除
                 </el-button>
               </template>
@@ -60,6 +63,7 @@
       </trade-card>
       <report-dialog
               :switchDialog="switchDialog"
+              :reportId="form.id"
               @onClose="onClose()"
             ></report-dialog>
     </div>
@@ -68,7 +72,7 @@
 
 <script>
 
-import { getDetails, tradingBox, submit, warehousingComplete } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
+import { getDetails, tradingBox, submit, warehousingComplete , revokeOutboundCompleted} from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
 import { dateFormat } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
 
@@ -80,6 +84,8 @@ export default {
       switchDialog: false,
       activeName: "sale_detail",
       disabled: false,
+      isDisabled:false,
+      isAddDisabled:false,
       form: {
         shipItemsList: [],
         shipVOList: [],
@@ -87,10 +93,12 @@ export default {
       },
       key: 0,
       optionForm: {
+        disabled:false,
         menuBtn: false,
         span: 8,
         column: [{
           label: '业务对象',
+          disabled:true,
           prop: "customerId",
           type: 'select',
           props: {
@@ -157,6 +165,7 @@ export default {
           ]
         }, {
           label: '入库单号',
+          disabled:true,
           prop: "ordNo",
           rules: [
             {
@@ -167,6 +176,7 @@ export default {
           ],
         }, {
           label: '来源单号',
+          disabled:true,
           prop: "srcOrdNo"
         }, {
           label: '备注',
@@ -362,6 +372,30 @@ export default {
     }
   },
   methods: {
+    // 撤销出库
+    revoke(){
+      this.$refs["form"].validate((valid, done) => {
+        done();
+        if (valid) {
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          revokeOutboundCompleted({
+            ...this.form,
+            bizTypeName: "FHGD"
+          }).then(res => {
+            this.$message.success("撤销成功");
+            this.refresh(res.data.data.id)
+            loading.close();
+          }).finally(() => {
+            loading.close();
+          });
+        }
+      })
+    },
     complete() {
       this.$refs["form"].validate((valid, done) => {
         done();
@@ -412,6 +446,8 @@ export default {
       });
     },
     refresh(id, type) {
+      this.$set(this.optionContactsBack,'addBtn',false)
+      this.isDisabled = true
       const loading = this.$loading({
         lock: true,
         text: '加载中',
@@ -419,6 +455,10 @@ export default {
         background: 'rgba(255,255,255,0.7)'
       })
       getDetails({ id: id }).then(res => {
+        if(res.data.data.statusName == '已出库'){
+          this.$set(this.optionForm,'disabled',true)
+          this.isAddDisabled = true
+        }
         this.form = res.data.data
         loading.close();
       }).catch(() => {

src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',270)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
+          <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button  :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -70,7 +70,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -7,9 +7,9 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <!--        <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"-->
-                <!--                   @click="confirmEditing">编辑-->
-                <!--        </el-button>-->
+                <el-button class="el-button&#45;&#45;small-yh" style="margin-right: 10px" type="primary" size="small" v-if="!editButton"
+                            @click="confirmEditing">编辑
+                </el-button>
                 <el-button class="el-button--small-yh" type="primary" size="small" @click="editCustomer">保存数据
                 </el-button>
                 <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.status !== '已发货'"
@@ -37,7 +37,7 @@
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="$refs.formContacts.rowEdit(row, index)">编辑
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="disabled" :type="type"
+                                <el-button icon="el-icon-delete" :size="size" :disabled="disabled  || isDisabled" :type="type"
                                     @click="rowDelBox(row, index, 'orderItemsList')">删除
                                 </el-button>
                             </template>
@@ -107,6 +107,7 @@ export default {
                 column: [{
                     label: '客户',
                     prop: "customerId",
+                    disabled: true,
                     type: 'select',
                     props: {
                         label: 'cname',
@@ -174,6 +175,7 @@ export default {
                     label: '收货地址',
                     prop: "recAddress",
                     type: 'select',
+                    disabled:true,
                     props: {
                         label: 'address',
                         value: 'id'
@@ -241,6 +243,18 @@ export default {
                     {
                         name: 'sendNum',
                         type: 'sum',
+                    },
+                    {
+                        name: 'subTotalMoney',
+                        type: 'sum',
+                    },
+                    {
+                        name: 'costprie',
+                        type: 'sum',
+                    },
+                    {
+                        name: 'grossProfit',
+                        type: 'sum',
                     }
                 ],
                 addBtnText: "录入明细",
@@ -334,13 +348,8 @@ export default {
                     disabled: false,
                     overHidden: true,
                     width: 100
-                }, {
-                    label: '数量',
-                    prop: 'goodsNum',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
+                }, 
+                {
                     label: '单位',
                     prop: 'units',
                     type: "select",
@@ -356,7 +365,7 @@ export default {
                     label: '批次号',
                     prop: 'dot',
                     type: "select",
-                    disabled: false,
+                    disabled: true,
                     allowCreate: true,
                     filterable: true,
                     dicData: [],
@@ -368,48 +377,66 @@ export default {
                     overHidden: true,
                 },
                 {
+                    label: '数量',
+                    prop: 'goodsNum',
+                    overHidden: true,
+                    disabled: false,
+                    width: 100
+                },
+    
+                {
                     label: '价格',
                     prop: 'price',
                     overHidden: true,
                     width: 100,
                     disabled: false,
                 },
-                    // {
-                    //     label: '发货数量',
-                    //     prop: 'sendNum',
-                    //     disabled: false,
-                    //     overHidden: true,
-                    //     width: 100
-                    // },
-                    //  {
-                    //     label: '毛利',
-                    //     prop: 'grossProfit',
-                    //     overHidden: true,
-                    //     width: 100
-                    // },
-                    // {
-                    //   label: '利润',
-                    //   prop: 'profit',
-                    //   overHidden: true,
-                    //   width: 100
-                    // }
-                    // , {
-                    //     label: '小计',
-                    //     prop: 'subTotalMoney',
-                    //     overHidden: true,
-                    //     width: 100
-                    // }, {
-                    //     label: '返利',
-                    //     prop: 'thisAmount',
-                    //     overHidden: true,
-                    //     width: 100
-                    // }, 
-                    // {
-                    //     label: '成本',
-                    //     prop: 'costprie',
-                    //     overHidden: true,
-                    //     width: 100
-                    // }
+             
+                {
+                    label: '发货数量',
+                    prop: 'sendNum',
+                    disabled: false,
+                    overHidden: true,
+                    width: 100
+                },
+                // {
+                //     label: '利润',
+                //     prop: 'profit',
+                //     overHidden: true,
+                //     width: 100
+                // }, 
+                {
+                    label: '小计',
+                    prop: 'subTotalMoney',
+                    overHidden: true,
+                    width: 100
+                }, 
+                // {
+                //     label: '返利',
+                //     prop: 'thisAmount',
+                //     overHidden: true,
+                //     width: 100
+                // }, 
+                {
+                    label: '成本',
+                    prop: 'costprie',
+                    overHidden: true,
+                    width: 100
+                },
+                {
+                    label: '毛利',
+                    prop: 'grossProfit',
+                    overHidden: true,
+                    width: 100
+                },
+                {
+                    label: '备注',
+                    prop: "remarks",
+                    overHidden: true,
+                    width: 100,
+                    disabled: false,
+
+                }
                 ]
             },
             optionPaymentDetails: {},
@@ -580,12 +607,29 @@ export default {
                 console.log('res', res);
                 this.form = res.data.data
                 // console.log(this.form.businessSource);
+                this.form.orderItemsList.forEach((items)=>{
+                    if(!items.subTotalMoney){
+                        items.subTotalMoney = items.goodsNum * items.price
+                        items.grossProfit = items.subTotalMoney - items.costprie
+                    }
+                })
+
                 loading.close();
                 if (this.form.businessSource == "外部销售") {
+                    console.log('外部销售');
+                    //不能录入不能删除
                     this.$set(this.optionContactsBack, "addBtn", false)
+                    this.isDisabled = true
+                    this.$set(this.form,'shipType','物流')
+                    this.$set(this.form,'receivableType','网络支付')
                     this.optionContactsBack.column.forEach(item => {
                         this.$set(item, 'disabled', true)
+                        if(item.label == '批次号' || item.label == '备注'){
+                            item.disabled = false
+                        }
                     })
+                    this['optionContacts'] = this['optionContactsBack'];
+                    this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
                     this.optionContactsBack.column.forEach(item => {
                         if (item.prop == 'dot') {
                             this.$set(item, disabled, false)
@@ -593,7 +637,10 @@ export default {
                             this.$set(item, disabled, true)
                         }
                     })
+
                 } else {
+                    this.$set(this.form,'shipType','物流')
+                    this.$set(this.form,'receivableType','现金')
                     this.optionContactsBack.column.forEach(item => {
                         this.$set(item, 'disabled', false)
                     })
@@ -602,7 +649,11 @@ export default {
                             item.disabled = true;
                         }
                     })
+                    this['optionContacts'] = this['optionContactsBack'];
+                    this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
                 }
+                // this.$set(this.form.orderItemsList,'goodsNum',66)
+
             }).catch(() => {
                 loading.close();
             })

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -17,8 +17,8 @@
           @saveColumn="saveColumnTwo('crud','option','optionList',269)"
           :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
-          <el-button icon="el-icon-delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)" >删除</el-button>
+          <el-button  :size="size" :type="type" @click="check(row)">查看</el-button>
+          <el-button :size="size" :type="type" @click="$refs.crud.rowDel(row,index)" >删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
@@ -70,7 +70,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 140,
+        menuWidth: 100,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,