暂存

src/App.vue

@@ -24,7 +24,7 @@
     watch: {
       $route(val) {
         this.system = JSON.parse(sessionStorage.getItem('module_info'))
-        this.system.forEach(sys => {
+        this.system?this.system.forEach(sys => {
           sys.modules.forEach(md=>{
             md.apps.forEach(app=>{
               if (val.name == app.name) {
@@ -34,7 +34,7 @@
               }
             })
           })
-        });
+        }):"";
       }
     }
   }

src/Form/QuotedPrice/add.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import projec_quotation_add from '@/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd'
+import projec_quotation_add from '@/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue'
 export default {
   name: "add",
   data(){

src/Form/contractManage/add.vue

@@ -39,7 +39,6 @@
 
 <script>
 import {mapGetters} from 'vuex'
-import { log } from '@antv/g2plot/lib/utils'
 
 export default {
   components:{

src/HDrpManagement/contractManage/components/addContract.vue

@@ -191,7 +191,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="500">
-                  <selectAgent type="7" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="6" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -306,14 +306,14 @@
                   v-model="accountVisible"
                   width="600">
 <!--                  <selectAgent type="2" ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>-->
-                  <el-tabs v-model="activeName"  type="border-card" @tab-click="tabClick">
-                    <el-tab-pane label="客户" name="客户">
-                      <selectAgent ref="member" type="7" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <!-- <el-tabs v-model="activeName" @tab-click="tabClick">
+                    <el-tab-pane label="企业" name="企业">
                     </el-tab-pane>
                     <el-tab-pane label="经销商" name="经销商">
                       <selectAgent ref="member" type="5" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                     </el-tab-pane>
-                  </el-tabs>
+                  </el-tabs> -->
+                  <selectAgent ref="member" type="10" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -464,7 +464,7 @@
 <script>
 import {mapGetters} from 'vuex'
 import selectPople from './selectSaler'
-import selectAgent from './selectAgent'
+import selectAgent from './selectAgent.vue'
 import seleteProject from './seleteProject'
 import seleteProjectContract from './seleteProjectContract'
 import TimeSelect from './TimeSelect'
@@ -501,7 +501,7 @@ export default {
       }
     }
     return {
-      activeName: '客户',
+      activeName: '企业',
       agentVisible:false,
       salerVisible:false,
       projectVisible:false,
@@ -613,9 +613,9 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
-              "condition": "",
-              "type":'',
-              "typemx":"",
+            "condition": "",
+            "type":5,
+            "typemx":"",
           }
         }
       },

src/HDrpManagement/orderManage/modules/edit.vue

@@ -213,7 +213,7 @@
         <el-input size="mini" class="order__note__input" type="textarea" v-model="data.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>
       </div>
       <div class="mt-10">
-        <p class="normal-title inline-16">寄付方式</p>
+        <p class="normal-title inline-16">运费方式</p>
       </div>
       <div class="mt-10 flex-align-center">
         <div :style="defaultData.freightstatus === '到付'?{background:'#d9ecff'}:{background:'#fff'}" class="reveive__panel normal-margin inline-16" @click="defaultData.freightstatus = '到付'">

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -117,7 +117,7 @@
 </template>
 
 <script>
-import selectActivity from '@/SManagement/orderclue/components/selectActivity/selectActivity'
+import selectActivity from '@/SManagement/orderclue/components/selectActivity/selectActivity.vue'
 import businessMessage from "@/components/businessMessage";
 export default {
   components: {selectActivity,businessMessage},

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -315,7 +315,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 10,
-          "type":0, //  1：我负责的；2：我参与的；3：我下属负责的；4：我下属参与的
+          "type":1, //  1：我负责的；2：我参与的；3：我下属负责的；4：我下属参与的
           "where": {
             "condition": "",
             "startdate": "",

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -381,12 +381,20 @@ export default {
         },
       })
     },
-    async updateOrder (val) {
+    async updateOrder (val,fn) {
       const res  = await this.$api.requested({
         "id": 20221109093602,
         "content": val
       })
-      this.$emit('onSuccess')
+      if (res.code == 1) {
+        this.$emit('onSuccess')
+        fn?fn():''
+      } else {
+        this.$message({
+          type:'error',
+          message:res.data + ':' + res.msg
+        })
+      }
     },
     setPickerOptions (val) {
       var startDate = val.deliverydate
@@ -424,33 +432,15 @@ export default {
       })
     },
     inputChange (row,index) {
-      console.log(row.defaultprice,Number(row.contractprice))
-      if (row.defaultprice < Number(row.contractprice)) {
-        this.$message({
-          message:'价格不能低于原价!',
-          type:'error'
-        }) 
-        row.defaultprice = row.contractprice
-        this.updateOrder({
-          "sa_orderid": this.data.sa_orderid, //订单ID
-          "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
-          "sa_contractid": this.data.contacts.contactsid, //合同ID
-          "type": this.data.type, //订单类型
-          "items": this.tableData
-        })
-      } else {
-        // row.defaultprice = row.contractprice
-        this.$set(this.tableData,index,row)
-        this.updateOrder({
-          "sa_orderid": this.data.sa_orderid, //订单ID
-          "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
-          "sa_contractid": this.data.contacts.contactsid, //合同ID
-          "type": this.data.type, //订单类型
-          "items": this.tableData
-        })
-        
-      }
-      
+      this.updateOrder({
+        "sa_orderid": this.data.sa_orderid, //订单ID
+        "sys_enterpriseid": this.data.sys_enterpriseid, //企业ID
+        "sa_contractid": this.data.contacts.contactsid, //合同ID
+        "type": this.data.type, //订单类型
+        "items": this.tableData
+      },()=>{
+         this.$set(this.tableData,index,row)
+      })
     }
   },
   mounted () {

src/SManagement/orderclue/components/selectActivity/selectActivity.vue

@@ -66,6 +66,7 @@ export default {
           "pageNumber":1,
           "pageSize":20,
           "where": {
+            "unend":1,
             'condition':''
           }
         }

src/components/normal-basic-layout/index.vue

@@ -18,9 +18,9 @@
                 <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               </div>
               <slot name="titleLight"></slot>
-              <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
+              <!-- <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
                 <el-button :type="selection.length === 0?'':'primary'" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
-              </el-button-group>
+              </el-button-group> -->
               <!-- <el-button class="inline-16" size="small" type="primary" plain>导 入</el-button> -->
               <excel :tablecols="layout" :param="param" :total="total" :specialKey="specialKey" :excelTitle="routerName"></excel>
             </div>