代码上传

src/Form/productMoneyOdd/add.vue

@@ -56,8 +56,8 @@ export default {
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
           console.log(res.data,'商品调价单')
-          /*this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/productMoneyOddDetail',query:{id:res.data.sa_itempriceadjustid,rowindex:res.data.rowindex}})*/
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productMoneyOddDetail',query:{id:res.data[0].sa_itempriceadjustid,rowindex:res.data[0].rowindex}})
         })
       })
     },

src/Form/productMoneyOdd/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="editBtn">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
     <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible" width="30%">
       <div slot="title" style="font-size: 15px">
         新增价格调整单

src/HDrpManagement/afterSalesmag/components/add.vue

@@ -84,7 +84,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/bankStatement/components/confirm.vue

@@ -29,12 +29,10 @@
         </el-table-column>
          <el-table-column
           prop="contact"
-          label="联系人"
-          width="90">
+          label="联系人">
         </el-table-column>
         <el-table-column
-          label="地址"
-          width="180">
+          label="地址">
           <template slot-scope="scope">
             {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
           </template>

src/HDrpManagement/orderManage/details/index.vue

@@ -159,10 +159,37 @@ export default {
       
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
         {
           label:'订单状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '新建':
+                style = {color:"#000000"}
+                break;
+              case '提交':
+                style = {color:"#d90a0a"}
+                break;
+              case '交期待确认':
+                style = {color:"#e09a1a"}
+                break;
+              case '交期确认':
+                style = {color:"#3874f6"}
+                break;
+              case '审核':
+                style = {color:"#52C41A"}
+                break;
+              case '关闭':
+                style = {color:"#b2c0ea"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label:'订单类型',

src/HDrpManagement/orderManage/index.vue

@@ -77,7 +77,15 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div v-if="scope.data.column.columnname == 'ischange'">
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#e09a1a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '交期待确认'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '交期确认'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'ischange'">
           {{ +scope.data.column.data.ischange ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">

src/HDrpManagement/productMoneyOdd/components/Del.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-popconfirm title="确定删除当前价格调整单吗？" @confirm="deleteRow()">
-      <el-button slot="reference" size="mini" :disabled="isEdit()">删 除</el-button>
+      <el-button type="primary" slot="reference" size="mini" :disabled="isEdit()">删 除</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/productMoneyOdd/components/check.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-popconfirm title="确定通过审核吗？" @confirm="CheckRow()">
-      <el-button slot="reference" :disabled="isEdit()" size="mini">审 核</el-button>
+      <el-button type="primary" slot="reference" :disabled="isEdit()" size="mini">审 核</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -288,7 +288,7 @@ export default {
         }
       })
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0]
+      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
     },
 
     // 账号信息

src/HManagement/archvies_mag/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="编辑文件夹" :visible.sync="dialogFolderVisible">
+    <el-dialog append-to-body title="编辑文件夹" :visible.sync="dialogFolderVisible">
       <div class="flex-align-center container">
         <p style="width:100px">文件夹名称</p>
         <el-input readonly size="small" v-model="folder.document"></el-input>

src/HManagement/archvies_mag/modules/list.vue

@@ -195,6 +195,7 @@ export default {
   margin-bottom: 15px;
   cursor: pointer;
   font-size: 14px;
+  margin: 0 !important;
   /* min-height: 110px; */
 }
 

src/HManagement/archvies_mag/modules/modifyLocation.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="移动到" :visible.sync="dialogTreeVisible" width="500px">
+  <el-dialog append-to-body title="移动到" :visible.sync="dialogTreeVisible" width="500px">
     <div class="border">
       <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" :load="loadNode" lazy highlight-current accordion>
         <div :class="data.class" slot-scope="{ node, data }">

src/HManagement/archvies_mag/modules/moreOperation.vue

@@ -10,7 +10,7 @@
       <el-dropdown-item @click.native="showFileTree">移动到</el-dropdown-item>
     </el-dropdown-menu>
     <modifyLocation ref="modefy" :checklist="checklist" @onChangeFolderModify="onChangeFolderModify"></modifyLocation>
-    <el-dialog title="分享" :visible.sync="urlDialog" width="500px">
+    <el-dialog append-to-body title="分享" :visible.sync="urlDialog" width="500px">
       <div class="border">
       <el-input placeholder="链接地址" v-model="checklist[0].url">
         <el-button slot="append" @click="test">复制</el-button>

src/SDrpManagement/myaccountclass/index.vue

@@ -61,6 +61,7 @@ export default {
     return {
       activeName:0,
       acountlist:[],
+      tablecols:[],
       list:[],
       param: {
         "id":20230111103403,
@@ -73,8 +74,6 @@ export default {
       total:0
     }
   },
-  async created () {
-  },
   methods:{
     async listData () {
       const res = await this.$api.requested({
@@ -93,6 +92,7 @@ export default {
       this.param.content.sa_accountclassid = this.acountlist[this.activeName].sa_accountclassid
       const res = await this.$api.requested(this.param)
       this.list = res.data.rows
+      console.log(res,"res的数据")
     },
     handleClick (index) {
       this.activeName = index