Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/Form/marketing2/agent/add.vue

@@ -78,23 +78,49 @@
               <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="经销商等级:">
-              <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_level"
-                  :key="item.value"
-                  :label="item.remarks"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否服务经销商:" prop="isservice">
-              <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
-            </el-form-item>
-          </el-col>
+          <el-col :span="12" v-if="radio === 1">
+              <el-form-item label="免运费额度" prop="freefreightamount">
+                <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="可退货天数" prop="limitreturnday">
+                <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
+              </el-form-item>
+            </el-col>
+            
+            <el-col :span="12">
+              <el-form-item label="开票节点" prop="invoicingpoint">
+                <el-radio-group v-model="form.invoicingpoint">
+                  <el-radio :value="1" label="订单审核"></el-radio>
+                  <el-radio :value="2" label="发货"></el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否服务经销商:" prop="isservice">
+                <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业等级">
+                <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
+                  <el-option
+                    v-for="item in agent_level"
+                    :key="item.value"
+                    :label="item.remarks"
+                    :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
+                <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
+              </el-form-item>
+            </el-col>
         </el-form>
       </el-row>
       </div>
@@ -114,6 +140,7 @@ selectAgent
 export default {
   data () {
     return {
+      radio:-1,
       title:'选择上级经销商',
       rules: {
         enterprisename: [
@@ -145,6 +172,13 @@ export default {
         "type": "",
         "erpagentnum": "",
         "isservice": 1, //是否服务商，0或1
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点（1:订单审核：2:发货）
+        "saleclassauth": 1, //是否需要经营授权,默认1
+        "grade":''
       },
       ENlist:[],
       agent_level:[],
@@ -225,6 +259,19 @@ export default {
           })
       })
     },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    },
     onChange () {
       this.visible = true
       this.debounce(this.queryEnterpriseArchives,500)()

src/Form/marketing2/agent/edit.vue

@@ -75,39 +75,78 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="经销商类型" prop="type">
-                <el-select style="width:100%" v-model="form.type" placeholder="请选择">
-                  <el-option
-                    v-for="item in agent_type"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
+            <el-form-item label="经销商类型:" prop="type">
+              <el-select style="width:100%" v-model="form.type" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_type"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上级经销商:">
+              <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="经销商等级:">
+              <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_level"
+                  :key="item.value"
+                  :label="item.remarks"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12" v-if="radio === 1">
+              <el-form-item label="免运费额度" prop="freefreightamount">
+                <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="上级经销商">
-                <selectAgent ref="agent" @selectAgent="selectAgent"></selectAgent>
+              <el-form-item label="可退货天数" prop="limitreturnday">
+                <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="12">
-              <el-form-item label="经销商等级">
-                <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
+            
+            <el-col :span="12">
+              <el-form-item label="开票节点" prop="invoicingpoint">
+                <el-radio-group v-model="form.invoicingpoint">
+                  <el-radio :label="1">订单审核</el-radio>
+                  <el-radio :label="2">发货</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否服务经销商:" prop="isservice">
+                <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业等级">
+                <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
                   <el-option
                     v-for="item in agent_level"
                     :key="item.value"
                     :label="item.remarks"
                     :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col> -->
+            </el-col>
             <el-col :span="12">
-            <el-form-item label="是否服务经销商:" prop="isservice">
-                <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
+              <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
+                <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
               </el-form-item>
             </el-col>
+            
           </el-form>
         </el-row>
       </div>
@@ -158,14 +197,23 @@ export default {
         ],
         "type": "",
         "erpagentnum": "",
-        "isservice": 1 //是否服务商，0或1
+        "isservice": 1, //是否服务商，0或1
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点（1:订单审核：2:发货）
+        "saleclassauth": 1, //是否需要经营授权,默认1
+        "grade":''
       },
       ENlist:[],
       agent_level:[],
       arealist:[],
       agent_type:[],
       enterprise:{},
-      timer:0
+      timer:0,
+      radio:-1,
+      title:'选择上级经销商',
     }
   },
   components:{
@@ -237,6 +285,19 @@ export default {
       const res1 = await this.$store.dispatch('optiontypeselect','agenttypemx')
       this.agent_type = res1.data
     },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
           if (!valid) return false

src/HDrpManagement/ProductMag/detail/index.vue

@@ -175,6 +175,10 @@ export default {
         {
           label:'领域',
           value:this.mainData.tradefield.map(item => item.tradefield).join(',')
+        },
+         {
+          label:'库存',
+          value:this.mainData.invbal_qty
         },
         /*{
           label:'上/下架',

src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -18,19 +18,20 @@
         label="状态"
         width="90">
       </el-table-column>
-      <!-- <el-table-column
-        prop="status"
+      <el-table-column
+        prop="sumqty"
         label="发货数量"
         width="90">
       </el-table-column>
       <el-table-column
-        prop="status"
+        prop="sumamount"
         label="发货金额"
         width="90">
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="billdate"
-        label="发货日期">
+        label="发货日期"
+        width="160px">
       </el-table-column>
       <el-table-column
         prop="address"

src/HDrpManagement/serveBill/modules/detail.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.billno"
-        :oldFormPath="{edit:'/HDrpManagement/serveBill/components'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20230206091703"

src/HManagement/notice/list/modules/add.vue

@@ -21,7 +21,7 @@ export default {
         "content": "",
         "issecret": 1,
         "begdate":(new Date()).toLocaleDateString(),
-        "enddate":'',
+        "enddate":(new Date()).toLocaleDateString(),
         "isontop":0
       }
     }

src/HManagement/siteManage/tagManage/components/edit.vue

@@ -9,7 +9,7 @@
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="left" size="mini">
           <el-col :span="24">
             <el-form-item label="新增标签" prop="tag">
-              <el-input v-model="form.tag" placeholder="请输入标签名"></el-input>
+              <el-input :disabled="!!data.issystem" v-model="form.tag" placeholder="请输入标签名"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/HManagement/submit/list/modules/submit_add.vue

@@ -53,10 +53,10 @@
               </el-row>
             </div>
             <div class="container normal-panel normal-margin">
-              <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain" :onlyread="store.state.pageOnlyRead">
+              <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain();fileHandleSuccess()" :onlyread="store.state.pageOnlyRead">
                 <upload slot="upload" :folderid="folderid"
-                        :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: form.sat_submiteditmodelid, usetype: 'default' }"
-                        @onSuccess="onSubmit()"></upload>
+                          :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: $route.query.id, usetype: 'default' }"
+                          @onSuccess="fileHandleSuccess"></upload>
               </attachmentList>
             </div>
           </el-col>
@@ -226,6 +226,19 @@ export default {
 
       this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
       
+    },
+    async fileHandleSuccess () {
+      const res = await this.$api.requested({
+        /*"classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "insertorupdate",*/
+        "id":20221102093902,
+        "content": {
+          sat_submiteditmodelid:this.$route.query.id
+        }
+      })
+      this.form = Object.assign({},this.form,res.data)
+      console.log(this.form);
+      
     },
     onSubmit() {
       this.$refs['form'].validate(async (valid) => {

src/HManagement/submit/list/modules/submit_edit.vue

@@ -65,7 +65,7 @@
                 <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain" :onlyread="store.state.pageOnlyRead">
                   <upload slot="upload" :folderid="folderid"
                           :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: form.sat_submiteditmodelid, usetype: 'default' }"
-                          @onSuccess="onSubmit()"></upload>
+                          @onSuccess="querySubmitMain()"></upload>
                 </attachmentList>
               </div>
             </el-col>
@@ -204,8 +204,6 @@ export default {
           "sat_submiteditmodelid": this.$route.query.id
         }
       })
-      console.log("获取数据")
-      console.log(res)
       res.data.notes == '初始化数据' + JSON.parse(sessionStorage.getItem('active_account')).userid ? res.data.notes = '' : '';
       this.form = Object.assign({}, this.form, res.data)
       if (this.form.isattrequired === 1) { this.form.type.push('附件提报') }
@@ -248,6 +246,8 @@ export default {
     },
     // 新增授权范围
     async insertCoursewareauth(data) {
+      console.log(data,'触发1');
+      
       this.authData.sat_submiteditmodelid = data.sat_submiteditmodelid
       if (this.authData.departmentid.length == 0) this.authData.departmentid = this.defaultData.departmentid
       if (this.authData.hrid.length == 0) this.authData.hrid = this.defaultData.hrid
@@ -257,6 +257,8 @@ export default {
         "id":"20221102094302",
         "content": this.authData
       })
+      console.log('触发2');
+      
       res.code === 0 ? this.$notify({
         title: '失败',
         message: res.data,
@@ -301,6 +303,7 @@ export default {
   },
   created() {
     this.status = false
+    this.query_auth()
   },
 }
 

src/SDrpManagement/shopCart/modules/list.vue

@@ -64,7 +64,7 @@
         </template>
       </el-table-column>-->
       <el-table-column
-        prop="gradeprice"
+        prop="oldprice"
         label="单价"
         width="90">
         <template slot-scope="scope">

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -10,7 +10,7 @@
         placement="right"
         trigger="manual"
         v-model="visible1"
-        width="300">
+        width="500">
         <member ref="member" :justsaler="justsaler" :param="param" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></member>
         <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" size="small" slot="reference" @click="showMenberSelect(item)">变更</el-button>
       </el-popover>
@@ -36,7 +36,7 @@
         placement="right"
         trigger="manual"
         v-model="visible"
-        width="300">
+        width="500">
         <member ref="member1" :justsaler="justsaler" :param="param" :radio="false" :checked="item.team" @onSelect="onSubmit" @onCancel="visible = false"></member>
         <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" size="small" slot="reference"  @click="showMenberSelect1(item)">添加</el-button>
       </el-popover>

src/utils/tool.js

@@ -67,7 +67,7 @@ export default {
   },
   /* 获取基本地址 */
   getBaseUrl () {
-    if (process.env.NODE_ENV == 'development') return 'http://122.226.136.204:8082'
+    if (process.env.NODE_ENV == 'development') return 'https://oms.idcgroup.com.cn:8079'
     let href = window.location.href
     let index = href.indexOf('/')
     let num = 0