Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/contractManage/index.vue

@@ -200,6 +200,8 @@ export default {
         isAuth : res.data.hr.isleader,
         userid: res.data.hr.userid
       }
+      console.log(this.userInfo);
+      
       window.sessionStorage.setItem('userInfo',JSON.stringify(this.userInfo))
       
     },

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="text" :disabled="isEdit()" @click="editBtn">编 辑 价 格</el-button>
-    <el-drawer title="编辑价格调整单商品价格" append-to-body :visible.sync="dialogFormVisible" width="50%">
+    <el-dialog title="编辑价格调整单商品价格" append-to-body :visible.sync="dialogFormVisible" size="500px">
       <div class="container">
         <el-row>
           <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
@@ -17,11 +17,11 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
-            <el-col :span="24">
+            <!-- <el-col :span="24">
               <el-form-item label="牌价" prop="marketprice">
                 <el-input size="mini" placeholder="请输入牌价" v-model="form.marketprice"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="一级原价" prop="price">
                 <el-input size="mini" :disabled="true" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
@@ -32,7 +32,7 @@
                 <el-input size="mini" placeholder="请输入调整价" v-model="form.price1"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="二级原价" prop="price">
                 <el-input size="mini" placeholder="请输入调整价"  :disabled="true" v-model="form.oldprice2"></el-input>
               </el-form-item>
@@ -71,15 +71,15 @@
               <el-form-item label="五级调整价" prop="price5">
                 <el-input size="mini" placeholder="请输入调整价" v-model="form.price5"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-form>
         </el-row>
       </div>
-      <div class="fixed__btn__panel">
+      <div class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-drawer>
+    </el-dialog>
   </div>
 </template>
 
@@ -152,7 +152,7 @@ export default {
             "id": "20221025165904",
             "content": {
                 "sa_itempriceadjustid": this.$route.query.id,
-                "marketprice":this.form.marketprice,
+                "marketprice":this.form.oldprice1,
                 "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
                 "sa_itempriceadjust_itemprice": content
             }

src/HDrpManagement/writeoffbill/components/add.vue

@@ -205,6 +205,8 @@ export default {
           }
           this.$emit('onSuccess')
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/writeoffbillDetail',query:{id:res.data[0].sa_writeoffbillid,rowindex:res.data[0].rowindex}})
         })
       })
     },

src/HDrpManagement/writeoffbill/modules/detail.vue

@@ -20,11 +20,11 @@
       <div slot="customOperation" >
         <edit class="inline-16" :disabled="isUse" :data="mainData" @onSuccess="queryMainData" v-if="tool.checkAuth($route.name,'update')"></edit>
         <check :disabled="isUse" class="inline-16" v-if="mainData" @onSuccess="queryMainData" :data="mainData"/>
-        <calc :disabled="isUse" v-if="tool.checkAuth($route.name,'calc')" class="inline-16" @onSuccess="queryMainData;$refs.orderTable.listData()"/>
+        <calc :disabled="isUse" v-if="tool.checkAuth($route.name,'calc')" class="inline-16" @onSuccess="queryMainData;$refs.orderTable.listData();queryMainData()"/>
       </div>
       <div slot="slot0" >
         <order-table ref="orderTable" @onSuccess="queryMainData" v-if="mainData">
-          <add-order :disabled="isUse" v-if="tool.checkAuth($route.name,'addOrder')" slot="addOrder" :data="mainData" @onSuccess="$refs.orderTable.listData()"></add-order>
+          <add-order :disabled="isUse" v-if="tool.checkAuth($route.name,'addOrder')" slot="addOrder" :data="mainData" @onSuccess="$refs.orderTable.listData();queryMainData()"></add-order>
           <template v-slot:editOrder="scope">
               <el-button class="inline-16" :disabled="isUse" v-if="tool.checkAuth($route.name,'editOrder')" type="text" size="mini" @click="$refs.orderTable.currentItem=scope.data">编 辑</el-button>
           </template>
@@ -167,7 +167,7 @@ export default {
           },
           
           {
-            label:'未核销金额',
+            label:'凭证未核销金额',
             value:this.mainData.unwriteoffamount
           },
           {

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites