修改bug

src/api/tirePartsMall/purchasingManagement/warehouseEntryOrder.js

@@ -47,6 +47,13 @@ export const warehousingComplete = (data) => {
     data: data
   })
 }
+export const revoke = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/revokeWarehousing',
+    method: 'POST',
+    data: data
+  })
+}
 export const goodsDetail = (data) => {
   return request({
     url: '/api/blade-sales-part/goodsDesc/goodsDetail',

src/components/fee-info/main.vue

@@ -30,7 +30,7 @@
           <el-button type="primary" icon="el-icon-plus" size="mini" @click.stop="addRow" :disabled="disabled" circle>
           </el-button>
         </template>
-        <template slot="corpId" slot-scope="{ row, index }">
+        <template slot="corpId" slot-scope="{ row, index }" >
           <crop-select ref="corp" v-if="row.$cellEdit" v-model="row.corpId" :cropIndex="index"
             @getCorpData="getCorpData" corpType="KG"></crop-select>
           <span v-else>{{ row.corpName }}</span>
@@ -148,6 +148,7 @@ export default {
   name: "feeInfo",
   data() {
     return {
+      corpIds:'',
       invoiceOption: {
         border: true,
         align: 'center',
@@ -517,7 +518,11 @@ export default {
       });
     },
     getCorpData(row) {
+      console.log(row);
+      console.log(' this.feeData', this.feeData);
       this.feeData[row.index].corpName = row.cname;
+      this.feeData[row.index].corpId = row.corpId;
+      this.corpIds = row.id
     },
     countChange(row) {
       if (row.price && row.quantity) {
@@ -571,13 +576,16 @@ export default {
         let corpName = ''
         if (!this.corpId) {
           corpName = this.corpList.find(item => this.$parent.$data.form.corpId == item.id).cname;
+          console.log('1',corpName);
         }
         if (this.corpId) {
           corpName = this.corpList.find(item => this.corpId == item.id).cname;
+          console.log('2',corpName);
+
         }
         const params = {
           feesType: this.selectTab,
-          corpId: this.corpId ? this.corpId : corpName,
+          corpId: this.corpId ? this.corpId : this.$parent.$data.form.corpId,
           // corpId: this.corpId ? this.corpId : '',
           corpName: this.corpId ? corpName : '',
           quantity:"1.000000",
@@ -658,6 +666,7 @@ export default {
       this.reData = null;
     },
     importData() {
+      console.log(123213);
       if (this.reData) {
         this.selectionList.length;
         if (this.selectionList.length != 1) {
@@ -705,6 +714,8 @@ export default {
         this.data_two = this.feeData;
       }
       list.push(...this.data_one, ...this.data_two);
+      console.log(list);
+      console.log(this.feeData);
       return list;
     },
 

src/components/report-dialog/main.vue

@@ -139,6 +139,7 @@ export default {
       });
     },
     goReport(name) {
+      console.log(name);
       let tenantId = this.$store.getters.userInfo.tenant_id;
       console.log(name);
       if (this.reportName == "同海-统计列表") {
@@ -159,14 +160,19 @@ export default {
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
           &year=${this.searchValue.year}
           &quarter=${this.searchValue.quarter}
-           &userType=${this.searchValue.userType}
-      &userId=${this.searchValue.userId}
-      &goodsId=${this.searchValue.goodsId}`
+          &userType=${this.searchValue.userType}
+          &userId=${this.searchValue.userId}
+          &goodsId=${this.searchValue.goodsId}`
         });
       }
       else if (name == "轮胎商城-入库工单.ureport.xml") {
-        console.log(1);
-  
+        console.log('this.reportId',this.reportId);
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
+          query: {
+            id: this.reportId,
+          }
+        });
       }
       // else if (name == "客户资料-客户资料.ureport.xml") {
       //   this.$router.push({

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3772,7 +3772,7 @@ export default {
           goodsId: item.itemId,
           itemType: item.itemType ? item.itemType : item.typeno,
           tradeType: 'GN',
-          storageId: this.form.storageId
+          storageId: item.storageId
         }).then(res => {
           if (res.data.data.length > 0) {
             item.storageQuantityList = res.data.data

src/views/exportTrade/salesContract/detailsPage.vue

@@ -2233,6 +2233,7 @@ export default {
             }
           }
           const orderFeesList = this.$refs.feeInfo.submitData();
+          console.log('orderFeesList',orderFeesList);
           for (let i = 0; i < orderFeesList.length; i++) {
             // if (orderFeesList[i].corpId == null) {
             //   return this.$message.error(`请输入第${i + 1}行的结算中心`);

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

@@ -169,6 +169,7 @@ export default {
         }, {
           label: '规格型号',
           prop: 'specificationAndModel',
+          disabled: true,
           search: true,
           overHidden: true,
         }, {
@@ -185,6 +186,7 @@ export default {
         }, {
           label: '库存',
           prop: 'inventory',
+          disabled: true,
           overHidden: true,
         }, {
           label: '产品状态',
@@ -206,6 +208,7 @@ export default {
         }, {
           label: "品牌",
           prop: "brandName",
+          disabled: true,
           overHidden: true,
         }, {
           label: "售价1",

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

@@ -13,9 +13,12 @@
                 <el-button class="el-button--small-yh" type="primary" size="small" v-if="form.statusName != '已入库'"
                     @click="editCustomer">保存数据
                 </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="success" size="small" v-if="form.statusName == '待入库' || form.statusName == '已撤销'"
                     @click="complete">入库完成
                 </el-button>
+                <el-button class="el-button--small-yh" type="success" size="small" v-if="form.statusName == '已入库'"
+                    @click="revoke">撤销入库
+                </el-button>
             </div>
         </div>
         <div style="margin-top: 50px">
@@ -61,7 +64,7 @@
                     </el-tab-pane>
                 </el-tabs>
             </trade-card>
-            <report-dialog :switchDialog="switchDialog" @onClose="onClose()"></report-dialog>
+            <report-dialog :switchDialog="switchDialog" :reportId="form.id" @onClose="onClose()"></report-dialog>
         </div>
         <el-dialog title="导入明细" append-to-body :visible.sync="excelBox" v-if="excelBox" width="555px"
             :close-on-click-modal="false" v-dialog-drag>
@@ -87,6 +90,7 @@ import {
     tradingBox,
     submit,
     warehousingComplete,
+    revoke,
     goodsDetail,
     dotList
 } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
@@ -235,7 +239,8 @@ export default {
                     },
                     {
                         label: "来源单号",
-                        prop: "srcOrdNo"
+                        prop: "srcOrdNo",
+                        disabled:true
                     }, {
                         label: '备注',
                         prop: "remarks",
@@ -340,6 +345,7 @@ export default {
                 }, {
                     label: "入库数量",
                     prop: "goodsNum",
+                    disabled:false,
                     ovrHidden: true,
                 }, {
                     label: "实际数量",
@@ -477,6 +483,7 @@ export default {
                     this.formContacts.pattern = res.data.data.brandItem
                     this.formContacts.goodsDescription = res.data.data.goodsDescription
                     this.formContacts.units = res.data.data.unit
+                    this.findObject(this.optionContacts.column, "goodsNum").disabled = true
                     if (res.data.data.whether == 0) {
                         this.findObject(this.optionContacts.column, "dot").disabled = true
                     } else {
@@ -522,6 +529,30 @@ export default {
             done();
             loading = true;
         },
+        //撤销
+        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)'
+                    });
+                    revoke({
+                        ...this.form,
+                        bizTypeName: "SHGD"
+                    }).then(res => {
+                        this.$message.success("撤销成功");
+                        this.refresh(res.data.data.id)
+                        loading.close();
+                    }).finally(() => {
+                        loading.close();
+                    });
+                }
+            })
+        },
         complete() {
             this.$refs["form"].validate((valid, done) => {
                 done();

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

@@ -83,7 +83,7 @@ export default {
         }],
         column: [{
           label: "入库单号",
-          prop: "billno",
+          prop: "ordNo",
           // billno
           search: true,
           overHidden: true,
@@ -97,7 +97,7 @@ export default {
           ]
         }, {
           label: "来源单号",
-          prop: "ordNo",
+          prop: "srcOrdNo",
           search: true,
           overHidden: true,
           // width: 120,

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

@@ -3,10 +3,13 @@
     <basic-container v-show="!detailsOpen">
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         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)"
+        @row-del="rowDel" @refresh-change="refreshChange"
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 271)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 271)" :page.sync="page">
-        <template slot-scope="{type,size,row,index}" slot="menu">
+        <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"
             @click="$refs.crud.rowDel(row, index)">删除
           </el-button>
@@ -58,6 +61,7 @@ export default {
         selection: true,
         viewBtn: false,
         editBtn: false,
+        celBtn: true,
         delBtn: false,
         addBtn: false,
         menu: true,
@@ -88,7 +92,13 @@ export default {
           prop: "customerName",
           search: true,
           width: 140,
+          type: 'select',
           overHidden: true,
+          props: {
+            label: 'cname',
+            value: 'id'
+          },
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH',
         }
           // , {
           //     label: "商品种类",
@@ -105,14 +115,30 @@ export default {
         {
           label: '来源公司',
           prop: "sourceCompanyId",
+          search: true,
           width: 100,
           overHidden: true,
+          type: 'select',
+          type: 'select',
+          props: {
+            label: 'fullName',
+            value: 'id'
+          },
+          dicUrl: '/api/blade-system/dept/top-list'
         },
         {
           label: '发货仓库',
           prop: "storageName",
           width: 100,
+          search: true,
           overHidden: true,
+          cell:false,
+          type: 'select',
+          props: {
+            label: 'cname',
+            value: 'id'
+          },
+          dicUrl: '/api/blade-sales-part/storageDesc/listAll',
         },
         //  {
         //   label: '发货库管',
@@ -126,18 +152,18 @@ export default {
           width: 200,
           overHidden: true,
         },
-         {
+        {
           label: '销售数量',
           prop: "goodsTotalNum",
           width: 100,
           overHidden: true,
-        }, 
-         {
+        },
+        {
           label: '发货数量',
           prop: "goodsTotalShipNum",
           width: 100,
           overHidden: true,
-        },  
+        },
         {
           label: '联系人',
           prop: "contacts",
@@ -152,7 +178,16 @@ export default {
           label: '状态',
           prop: "statusName",
           width: 100,
+          search: true,
+          type: 'select',
           overHidden: true,
+          dicData: [{
+            label: '待处理',
+            value: '待处理'
+          }, {
+            label: '已派工',
+            value: '已派工'
+          }]
         }, {
           label: '备注',
           prop: "remarks",
@@ -232,6 +267,10 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
+    rowCell(row,index){
+      this.findObject(this.optionList.column, "storageName").cell = true
+      this.$refs.crud.rowCell(row, index)
+    },
     rowDel(form, index) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -250,6 +289,7 @@ export default {
       });
     },
     searchChange(params, done) {
+      console.log(params);
       done();
       this.onLoad(this.page, params)
     },
@@ -286,7 +326,9 @@ export default {
     },
     //自定义列重置
     async resetColumnTwo(ref, option, optionBack, code) {
-      this[option] = this[optionBack];
+      console.log(this[option]);
+      console.log(this[optionBack]);
+      // this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("重置成功");

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

@@ -145,6 +145,7 @@ export default {
                 }, {
                     label: '单据编号',
                     prop: "ordNo",
+                    disabled: true
                 }, {
                     label: '来源单号',
                     prop: "srcOrdNo",
@@ -185,25 +186,37 @@ export default {
                     }]
                 }, {
                     label: '配送方式',
+                    type: 'select',
                     prop: "shipType",
+                    dicUrl: "/api/blade-system/dict-biz/dictionary?code=deliveryMethod",
+                    props: {
+                        label: "dictValue",
+                        value: "dictValue"
+                    },
+                    value: '物流'
                 }, {
                     label: '物流公司',
                     prop: "logisticsCorpName"
                 }, {
                     label: '成本',
-                    prop: "cost"
+                    prop: "cost",
+                    disabled: true
                 }, {
                     label: '毛利',
-                    prop: "grossProfit"
+                    prop: "grossProfit",
+                    disabled: true
                 }, {
                     label: '销售金额',
-                    prop: "salesAmount"
+                    prop: "salesAmount",
+                    disabled: true
                 }, {
                     label: '运费',
-                    prop: "freight"
+                    prop: "freight",
+                    disabled: true
                 }, {
                     label: '总金额',
-                    prop: "totalMoney"
+                    prop: "totalMoney",
+                    disabled: true
                 }, {
                     label: '备注',
                     prop: "remarks",
@@ -215,9 +228,21 @@ export default {
             formContacts: {},
             optionContacts: {},
             optionContactsBack: {
+                disabled: false,
                 border: true,
                 align: 'center',
                 index: true,
+                showSummary: true,
+                sumColumnList: [
+                    {
+                        name: 'goodsNum',
+                        type: 'sum',
+                    },
+                    {
+                        name: 'sendNum',
+                        type: 'sum',
+                    }
+                ],
                 addBtnText: "录入明细",
                 refreshBtn: false,
                 dialogDrag: true,
@@ -349,13 +374,13 @@ export default {
                     width: 100,
                     disabled: false,
                 },
-                {
-                    label: '发货数量',
-                    prop: 'sendNum',
-                    disabled: false,
-                    overHidden: true,
-                    width: 100
-                },
+                    // {
+                    //     label: '发货数量',
+                    //     prop: 'sendNum',
+                    //     disabled: false,
+                    //     overHidden: true,
+                    //     width: 100
+                    // },
                     //  {
                     //     label: '毛利',
                     //     prop: 'grossProfit',
@@ -458,7 +483,6 @@ export default {
         detailData: Object
     },
     async created() {
-
         this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
         this.findObject(this.optionContacts.column, "goodsId").change = ({ value, column }) => {
             if (this.formContacts.goodsId !== value) {
@@ -553,16 +577,29 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             })
             getDetails({ id: id }).then(res => {
+                console.log('res', res);
                 this.form = res.data.data
                 // console.log(this.form.businessSource);
                 loading.close();
                 if (this.form.businessSource == "外部销售") {
-                    this.$set(this.optionContactsBack,"addBtn",false)
+                    this.$set(this.optionContactsBack, "addBtn", false)
+                    this.optionContactsBack.column.forEach(item => {
+                        this.$set(item, 'disabled', true)
+                    })
                     this.optionContactsBack.column.forEach(item => {
                         if (item.prop == 'dot') {
-                            this.$set(item,disabled,false)
+                            this.$set(item, disabled, false)
                         } else {
-                            this.$set(item,disabled,true)
+                            this.$set(item, disabled, true)
+                        }
+                    })
+                } else {
+                    this.optionContactsBack.column.forEach(item => {
+                        this.$set(item, 'disabled', false)
+                    })
+                    this.optionContactsBack.column.forEach(item => {
+                        if (item.label === '规格型号' || item.label === '花纹' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '商品描述' || item.label === '批次号') {
+                            item.disabled = true;
                         }
                     })
                 }