修改bug

src/views/tirePartsMall/financingManagement/financingManagement/detailsPage.vue

@@ -183,7 +183,7 @@ export default {
                         label: "制单日期",
                         prop: "createTime",
                         type: "date",
-                        format: "yyyy-MM-dd",
+                        format: "yyyy-MM-dd HH:mm:ss",
                         valueFormat: "yyyy-MM-dd HH:mm:ss",
                         overHidden: true,
                     },
@@ -252,16 +252,16 @@ export default {
                         type: "warning",
                     });
                 } else {
-                    this.$router.$avueRouter.closeTag("/tirePartsMall/purchasingManagement/warehouseEntryOrder/index");
+                    this.$router.$avueRouter.closeTag("/tirePartsMall/salesManagement/outboundWorkOrder/index");
                     this.$router.push({
-                        path: "/tirePartsMall/purchasingManagement/warehouseEntryOrder/index",
+                        path: "/tirePartsMall/salesManagement/outboundWorkOrder/index",
                         query: {
                             srcId: row.srcId
                         },
                     });
                 }
             }
-            if (row.type == "融资退货") {
+            if (row.type == "融资销售退货-撤销入库"||row.type == "融资销售退货-入库确认") {
                 if (this.$store.getters.inboundAndOutbound) {
                     this.$alert("出入库工单已存在,请关闭出入库工单再进行操作", "温馨提示", {
                         confirmButtonText: "确定",

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

@@ -690,7 +690,7 @@ export default {
             this.refresh()
         }
         if (this.$route.query.srcId) {
-            this.refresh()
+            this.refresh(this.$route.query.srcId)
         }
         this.$store.commit("DOMIO_IN_DETAIL");
     },

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

@@ -38,10 +38,23 @@
                 <!--<el-button :size="size" :disabled="disabled || isAddDisabled" :type="type"-->
                 <!--  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">编辑-->
                 <!--</el-button>-->
-                  <el-button :size="size" :disabled="disabled || isDisabled" :type="type"
-                             :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
-                      {{row.$cellEdit?'保存':'编辑'}}
+                <el-popover placement="left" width="500" trigger="click">
+                  <el-table :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                    :cell-style="{ padding: '0px', fontSize: '12px' }" :data="row.recordList"
+                    :header-cell-style="tableHeaderCellStyle" border stripe height="300px" style="width: 100%">
+                    <el-table-column property="srcOrd" label="单号"></el-table-column>
+                    <el-table-column property="amount" label="金额"></el-table-column>
+                    <el-table-column property="createUserName" label="制单人"></el-table-column>
+                    <el-table-column property="createTime" label="制单日期"></el-table-column>
+                  </el-table>
+                  <el-button slot="reference" :size="size" :disabled="!row.id" :type="type" icon="el-icon-view" style="margin-right: 8px;">
+                    查看记录
                   </el-button>
+                </el-popover>
+                <el-button :size="size" :disabled="disabled || isDisabled" :type="type"
+                  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
+                  {{ row.$cellEdit ? '保存' : '编辑' }}
+                </el-button>
                 <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled" :type="type"
                   @click="rowDelBox(row, index)">删除
                 </el-button>
@@ -65,10 +78,10 @@
         </el-tabs>
       </trade-card>
 
-        <containerTitle title="上传附件"></containerTitle>
-        <c-upload v-loading="loadingBtn" typeUpload="LT" :disabled="isAddDisabled"
-                  deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
-                  :enumerationValue="35.1"></c-upload>
+      <containerTitle title="上传附件"></containerTitle>
+      <c-upload v-loading="loadingBtn" typeUpload="LT" :disabled="isAddDisabled"
+        deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+        :enumerationValue="35.1"></c-upload>
 
       <report-dialog :switchDialog="switchDialog" :reportId="form.id" @onClose="onClose()"></report-dialog>
     </div>
@@ -87,9 +100,9 @@ export default {
   name: "detailsPage",
   data() {
     return {
-        // 上传附件的需要参数
-        loadingBtn:false,
-        filesList:[],
+      // 上传附件的需要参数
+      loadingBtn: false,
+      filesList: [],
 
       switchDialog: false,
       activeName: "sale_detail",
@@ -189,33 +202,33 @@ export default {
           disabled: true
         },
 
-          {
-            label: '配送方式',
-            prop: "shipType",
-            type: 'select',
-            disabled: false,
-            props: {
-              label: 'dictValue',
-              value: 'dictKey'
-            },
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=deliveryMethod'
-          },
-          {
-            label: '货运公司',
-            prop: "logisticsCorpName",
-            type: 'select',
-            disabled: false,
-            props: {
-              label: 'dictValue',
-              value: 'dictKey'
-            },
-            dicUrl: '/api/blade-system/dict-biz/dictionary?code=tyre_express_company'
+        {
+          label: '配送方式',
+          prop: "shipType",
+          type: 'select',
+          disabled: false,
+          props: {
+            label: 'dictValue',
+            value: 'dictKey'
           },
-          {
-            label: '货运单号',
-            prop: "expressNo",
-            disabled: false
+          dicUrl: '/api/blade-system/dict-biz/dictionary?code=deliveryMethod'
+        },
+        {
+          label: '货运公司',
+          prop: "logisticsCorpName",
+          type: 'select',
+          disabled: false,
+          props: {
+            label: 'dictValue',
+            value: 'dictKey'
           },
+          dicUrl: '/api/blade-system/dict-biz/dictionary?code=tyre_express_company'
+        },
+        {
+          label: '货运单号',
+          prop: "expressNo",
+          disabled: false
+        },
 
         {
           label: '订单数量',
@@ -258,12 +271,12 @@ export default {
         addRowBtn: false,
         editBtn: false,
         delBtn: false,
-        menuWidth: 140,
+        menuWidth: 200,
         dialogTop: 25,
         dialogWidth: "80%",
         showSummary: true,
-          saveBtn:false, // 表格弹窗保存按钮
-          cellBtn:false, // 行编辑
+        saveBtn: false, // 表格弹窗保存按钮
+        cellBtn: false, // 行编辑
         sumColumnList: [
           {
             name: 'goodsNum',
@@ -278,19 +291,19 @@ export default {
           disabled: true,
           width: 200,
           overHidden: true,
-            hide:true,
+          hide: true,
           type: 'select',
           props: {
             label: 'cname',
             value: 'id'
           },
           dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-        },{
-            label: '商品名称',
-            prop: 'goodsName',
-            disabled: true,
-            width: 200,
-            overHidden: true,
+        }, {
+          label: '商品名称',
+          prop: 'goodsName',
+          disabled: true,
+          width: 200,
+          overHidden: true,
         }, {
           label: '商品编码',
           disabled: true,
@@ -325,7 +338,7 @@ export default {
         }, {
           label: '批次号',
           prop: 'dot',
-          cell:true,
+          cell: true,
           type: 'select',
           disabled: true,
           dicData: [],
@@ -345,9 +358,9 @@ export default {
           },
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit"
         }, {
-            label: '库存',
-            prop: 'inventory',
-        },{
+          label: '库存',
+          prop: 'inventory',
+        }, {
           label: '出库数量',
           prop: 'goodsNum',
           disabled: false,
@@ -355,7 +368,7 @@ export default {
         }, {
           label: '发货数量',
           prop: 'sendNum',
-            cell:true,
+          cell: true,
           disabled: false,
         }, {
           label: '备注',
@@ -466,11 +479,11 @@ export default {
       this.refresh()
     }
     if (this.$route.query.srcId) {
-            this.refresh()
-        }
+      this.refresh(this.$route.query.srcId)
+    }
     this.$store.commit("DOMIO_IN_DETAIL");
   },
-  activated(){
+  activated() {
     if (this.detailData.id) {
       this.refresh()
     }
@@ -514,20 +527,20 @@ export default {
         goodsId: row.goodsId
       }).then(res => {
         this.findObject(this.optionContacts.column, "dot").dicData = res.data.data
-          // 增加监听数据改变更改库存数量
-          this.findObject(this.optionContacts.column, "dot").change = (data)=>{
-              for (let item of data.column.dicData) {
-                  if (item.dot == data.value) {
-                      this.$set(row,'inventory',item.balanceQuantity)
-                  }
-              }
+        // 增加监听数据改变更改库存数量
+        this.findObject(this.optionContacts.column, "dot").change = (data) => {
+          for (let item of data.column.dicData) {
+            if (item.dot == data.value) {
+              this.$set(row, 'inventory', item.balanceQuantity)
+            }
           }
-      })
-        if (row.$cellEdit) {
-            this.$set(row,'$cellEdit',false)
-        }else {
-            this.$set(row,'$cellEdit',true)
         }
+      })
+      if (row.$cellEdit) {
+        this.$set(row, '$cellEdit', false)
+      } else {
+        this.$set(row, '$cellEdit', true)
+      }
       // this.$refs.formContacts.rowEdit(row, index)
     },
     complete() {
@@ -576,15 +589,15 @@ export default {
             background: 'rgba(255,255,255,0.7)'
           });
           console.log(this.form)
-            // 判断处理
-            for (let index in this.form.shipItemsList) {
-                this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
-                if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
-                    this.$message.warning(`序号${index+1}的实际数量不能大于库存`);
-                    loading.close();
-                    return
-                }
+          // 判断处理
+          for (let index in this.form.shipItemsList) {
+            this.form.shipItemsList[index].goodsName = this.form.shipItemsList[index].$goodsId
+            if (Number(this.form.shipItemsList[index].sendNum) > Number(this.form.shipItemsList[index].inventory)) {
+              this.$message.warning(`序号${index + 1}的实际数量不能大于库存`);
+              loading.close();
+              return
             }
+          }
           // this.form.shipItemsList.forEach(item => {
           //   item.goodsName = item.$goodsId
           // })
@@ -592,7 +605,7 @@ export default {
           submit({
             ...this.form,
             bizTypeName: "FHGD",
-              filesList:this.filesList
+            filesList: this.filesList
           }).then(res => {
             this.$message.success("保存成功");
             this.refresh(res.data.data.id)
@@ -632,7 +645,7 @@ export default {
             this.isDisabled = true
           }
           this.form = res.data.data
-            this.filesList = res.data.data.filesList
+          this.filesList = res.data.data.filesList
           this.$nextTick(() => {
             this.$refs.formContacts.refreshTable()
           })
@@ -657,7 +670,7 @@ export default {
             this.isDisabled = true
           }
           this.form = res.data.data
-            this.filesList = res.data.data.filesList
+          this.filesList = res.data.data.filesList
           this.$nextTick(() => {
             this.$refs.formContacts.refreshTable()
           })
@@ -770,7 +783,11 @@ export default {
       this.$emit("backToList", type);
       // this.$store.commit("DOMIO_OUT_DETAIL");
 
-    }
+    },
+    // 表头样式
+    tableHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
+      return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff;textAlign:center"
+    },
   }
 }
 </script>

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

@@ -485,6 +485,10 @@ export default {
   activated() {
     setTimeout(() => {
       console.log(this.$route.query,400);
+      if (this.$route.query.srcId) {
+        this.$store.commit("IN_LTCG_STATUS");
+        this.editOpen({ id: this.$route.query.srcId }, 1)
+      }
         // 主页快捷跳转来的 直接打开新建订单
         if (this.$route.query.showTrue) {
             this.$store.commit("IN_LTCG_STATUS");
@@ -502,10 +506,6 @@ export default {
         check: this.$route.query.check,
         auditId: this.$route.query.check.id
       };
-      if (this.$route.query.srcId) {
-        this.$store.commit("IN_LTCG_STATUS");
-        this.editOpen({ id: this.$route.query.srcId }, 1)
-      }
     }, 100);
   },
   async created() {