修改bug

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

@@ -240,7 +240,7 @@ export default {
           overHidden: true,
         }, {
           label: "共享公司",
-          prop: "salesCompanyName",
+          prop: "sharedCompany",
           // searchProp: "sharedCompanyList",
           search: true,
           overHidden: true,
@@ -314,9 +314,9 @@ export default {
       console.log(params);
       console.log(params.$salesCompanyName);
       // sharedCompanyList
-      this.search.sharedCompanyList = params.salesCompanyName;
-      Vue.delete(params, 'salesCompanyName');
-      Vue.delete(this.search, 'salesCompanyName');
+      this.search.sharedCompanyList = params.sharedCompany;
+      Vue.delete(params, 'sharedCompany');
+      Vue.delete(this.search, 'sharedCompany');
       done();
       this.onLoad(this.page, params)
     },

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/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" v-if="form.statusName != '已入库'"
                     @click="editCustomer">保存数据
                 </el-button>
@@ -271,6 +271,7 @@ export default {
                 index: true,
                 menu: true,
                 dialogTop: 25,
+                disabled:false,
                 dialogWidth: "80%",
                 column: [{
                     label: '商品名称',
@@ -436,6 +437,7 @@ export default {
                     {
                         prop: "remarks",
                         label: "备注",
+                        disabled:false,
                         overHidden: true,
                         cell: true
                     }
@@ -511,7 +513,11 @@ export default {
         this.key++
         if (this.onLoad.id && this.detailData.id) {
             this.refresh(this.onLoad.id, true)
+            this.$set(this.optionForm,'disabled',true)
+            this.$set(this.optionContacts,'disabled',true)
+
         } else if (this.onLoad.id) {
+            console.log(2);
             this.refresh(this.onLoad.id, true)
         }
     },
@@ -561,6 +567,18 @@ export default {
                 }
             })
         },
+        //编辑
+        confirmEditing(){
+            this.$set(this.optionForm,'disabled',false)
+            this.$set(this.optionContacts,'disabled',false)
+            if(this.form.statusName == '待入库'){
+                this.optionContacts.column.forEach(item=>{
+                    if(item.prop == remarks){
+                        item.disabled = false
+                    }
+                })
+            }
+        },
         complete() {
             this.$refs["form"].validate((valid, done) => {
                 done();

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

@@ -7,16 +7,17 @@
         </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="warning" size="small" v-if="form.statusName == '已出库'"
           @click="revoke">撤销出库
         </el-button>
-        <el-button class="el-button--small-yh" type="primary" size="small" @click="editCustomer" 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" style="margin-left: 6px;" v-if="form.statusName == '待出库' || form.statusName == '撤销出库'"
-          @click="complete">出库完成
+        <el-button class="el-button--small-yh" type="success" size="small" style="margin-left: 6px;"
+          v-if="form.statusName == '待出库' || form.statusName == '撤销出库'" @click="complete">出库完成
         </el-button>
       </div>
     </div>
@@ -61,18 +62,14 @@
           </el-tab-pane>
         </el-tabs>
       </trade-card>
-      <report-dialog
-              :switchDialog="switchDialog"
-              :reportId="form.id"
-              @onClose="onClose()"
-            ></report-dialog>
+      <report-dialog :switchDialog="switchDialog" :reportId="form.id" @onClose="onClose()"></report-dialog>
     </div>
   </div>
 </template>
 
 <script>
 
-import { getDetails, tradingBox, submit, warehousingComplete , revokeOutboundCompleted} 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";
 
@@ -84,8 +81,8 @@ export default {
       switchDialog: false,
       activeName: "sale_detail",
       disabled: false,
-      isDisabled:false,
-      isAddDisabled:false,
+      isDisabled: false,
+      isAddDisabled: false,
       form: {
         shipItemsList: [],
         shipVOList: [],
@@ -93,14 +90,15 @@ export default {
       },
       key: 0,
       optionForm: {
-        disabled:false,
+        disabled: false,
         menuBtn: false,
         span: 8,
         column: [{
           label: '业务对象',
-          disabled:true,
+          disabled: true,
           prop: "customerId",
           type: 'select',
+          disabled:true,
           props: {
             label: 'cname',
             value: 'id'
@@ -115,6 +113,7 @@ export default {
           label: '仓库',
           prop: "storageId",
           type: 'select',
+          disabled:true,
           props: {
             label: 'cname',
             value: 'id'
@@ -129,6 +128,7 @@ export default {
           label: '库管',
           prop: "stockClerkId",
           type: 'select',
+          disabled:true,
           props: {
             label: 'realName',
             value: 'id'
@@ -143,6 +143,7 @@ export default {
         {
           label: '业务日期',
           prop: "createTime",
+          disabled:true,
           type: "datetime",
           value: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'),
           format: "yyyy-MM-dd HH:mm",
@@ -157,6 +158,7 @@ export default {
         },
         {
           label: '入库单号',
+          disabled: true,
           disabled:true,
           prop: "ordNo",
           rules: [
@@ -166,16 +168,19 @@ export default {
               trigger: "blur"
             }
           ],
-        }, 
+        },
         {
           label: '来源单号',
-          disabled:true,
-          prop: "srcOrdNo"
-        }, 
-         {
+          disabled: true,
+          prop: "srcOrdNo",
+          disabled:true
+        },
+        {
           label: '商品数量',
-          disabled:true,
+          disabled: true,
           prop: "goodsTotalNum",
+          disabled:true,
+
           rules: [
             {
               required: true,
@@ -188,6 +193,7 @@ export default {
           label: '备注',
           prop: "remarks",
           type: 'textarea',
+          disabled:true,
           span: 24,
           minRows: 2
         }]
@@ -273,6 +279,7 @@ export default {
           disabled: true,
         }, {
           label: '实际数量',
+          disabled: true,
           prop: 'sendNum'
         }, {
           label: '备注',
@@ -379,7 +386,7 @@ export default {
   },
   methods: {
     // 撤销出库
-    revoke(){
+    revoke() {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
@@ -437,7 +444,7 @@ export default {
             background: 'rgba(255,255,255,0.7)'
           });
           console.log(this.form)
-          this.form.shipItemsList.forEach(item=>{
+          this.form.shipItemsList.forEach(item => {
             item.goodsName = item.$goodsId
           })
           // this.goodsName;
@@ -457,8 +464,8 @@ export default {
       });
     },
     refresh(id, type) {
-      this.$set(this.optionContactsBack,'addBtn',false)
-      this.$set(this.optionContacts,'addBtn',false)
+      this.$set(this.optionContactsBack, 'addBtn', false)
+      this.$set(this.optionContacts, 'addBtn', false)
       this.isDisabled = true
       const loading = this.$loading({
         lock: true,
@@ -467,8 +474,8 @@ 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)
+        if (res.data.data.statusName == '已出库') {
+          // this.$set(this.optionForm, 'disabled', true)
           this.isAddDisabled = true
         }
         this.form = res.data.data
@@ -505,11 +512,21 @@ export default {
     //打印
     handlePrint() {
       this.switchDialog = !this.switchDialog;
-        
+
     },
     onClose(val) {
       this.switchDialog = val;
     },
+    //编辑
+    confirmEditing() {
+      this.optionForm.column.forEach(item => {
+        if (item.prop == 'remarks') {
+          item.disabled = false
+        }
+      })
+      this.isAddDisabled = false
+
+    },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
       /**

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

@@ -14,7 +14,7 @@
                     @click="editCustomer">保 存
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;"
-                    :class="{ 'el-button--success-yh': buttonColor === 'warning', 'el-button--warning-yh': buttonColor === 'warning' }"
+                    :type="buttonColor"
                     size="small" v-if="form.generateTask !== '已生成'" :disabled="isDisabledTask" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
@@ -189,8 +189,6 @@ export default {
                                 this.form.phone = res.data.data.corpsAttnList[0].tel
                                 this.contactsOption = res.data.data.corpsAddrList
                                 this.form.recAddress = res.data.data.corpsAddrList[0].id
-                                this.form.businessSource = '内部销售'
-
                             })
                         }
 
@@ -687,6 +685,10 @@ export default {
             this['optionContacts'] = this['optionContactsBack'];
             this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
         }
+        if(!this.detailData.id){
+        this.form.businessSource = '内部销售'
+
+        }
     },
     methods: {
         editBtn(row, index) {
@@ -850,6 +852,7 @@ export default {
                 console.log('res', res);
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }
+                let _this = this
                 getList(1, 50, ordForm).then((res) => {
                     this.dataList = res.data.data.records ? res.data.data.records : [];
                 })
@@ -858,7 +861,7 @@ export default {
                     this.isApplySettlement = false;
                 }
 
-                if (this.form.status == '退款中') {
+                if (this.form.status == '退款中' || this.form.status == '已取消') {
                     console.log(2);
                     this.isConfirmRefundBtn = false;
                 }