瀏覽代碼

代码上传

zhangqiOMG 3 年之前
父節點
當前提交
405cb82548

+ 0 - 27
src/Form/projectTask/add.vue

@@ -212,33 +212,6 @@
             return task
           })
           .forEach(task => task.projtaskmag_optionscore = this.calculate(task.projtaskmag_optionscore))
-        // // 判断是否选中数据,若无数据则自动取消勾选
-        // val.length === 0?this.form.onstage = 0:""
-        // this.projectStage = val
-        // // 判断客户对象是否有数据,若有数据指循环插入阶段数据
-        // if (this.partiesType.length > 0) {
-        //   let arr = []
-        //   val.forEach(ele => {
-        //     this.optionscore.forEach(opt => {
-        //       arr.push({
-        //         "sa_projtaskmag_optionscoreid":0,
-        //         "partiestype": opt.partiestype,
-        //         "stagename":ele.stagename,
-        //         "sa_projstagemagid": ele.sa_projstagemagid,
-        //         "score": 0
-        //       })
-        //     });
-        //   })
-        //   this.optionscore = this.tool.sortArr(arr,'partiestype')
-        // } else {
-        //   this.optionscore = val.map(e=>{
-        //     return {
-        //       partiestype:e.partiestype,
-        //       stagename:e.stagename,
-        //       sa_projstagemagid: ele.sa_projstagemagid,
-        //     }
-        //   })
-        // }
 
         
       },

+ 4 - 2
src/HManagement/saleForecastCount/index.vue

@@ -28,6 +28,7 @@
               :options="depOptions"
               :props="{ checkStrictly: true,children:'subdep',label:'depname',value:'departmentid' }"
               @change="onCascaderChange"
+              :show-all-levels="false"
               clearable>
             </el-cascader>
           </div>
@@ -113,8 +114,9 @@
       },
       onCascaderChange (val) {
         this.actDep = val[val.length - 1]
-        this.userid = ''
-        this.query_hrList()
+        this.$refs.basicLayout.param.content.where.departmentid = this.actDep
+        this.$refs.basicLayout.listData()
+        this.query_hrList(this.userid = '')
       },
       onSelectChange (val) {
         this.$refs.basicLayout.param.content.where.userid = val

+ 3 - 22
src/SDrpManagement/QuotedPrice/components/copy/index.vue

@@ -1,27 +1,8 @@
 <template>
   <div>
-    <el-drawer
-        title="编辑报价单"
-        :visible.sync="drawer"
-        size="92%"
-        direction="rtl"
-        :show-close="false"
-        append-to-body
-        >
-      <div class="drawer__panel" style="margin-bottom: 0px">
-
-      </div>
-      <div >
-        <el-divider></el-divider>
-      </div>
-<!--      <div style="margin:10px 20px 20px 20px">
-        <quotedPriceProduct :sa_quotedpriceid="form.sa_quotedpriceid" :sa_projectid="form.sa_projectid" :quotedpricetype="form.quotedpricetype" ref="quoterPrice" @checkForm="onSubmit" @productData="productDataChange"></quotedPriceProduct>
-      </div>-->
-      <div class="fixed__btn__panel">
-        <el-button size="small" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning"  class="normal-btn-width">确 定</el-button>
-      </div>
-    </el-drawer>
+    <div class="drawer__panel" style="margin-bottom: 0px">
+      123123121
+    </div>
   </div>
 </template>
 

+ 3 - 3
src/SDrpManagement/QuotedPrice/detail/components/copyTo.vue

@@ -95,11 +95,11 @@ export default {
         "id": 20221209094103,
       })
       console.log(res,"复制的内容")
-      this.$store.dispatch('changeDetailDrawer',true)
-      this.$router.push({
+      // this.$store.dispatch('changeDetailDrawer',true)
+      this.$router.replace({
         path:'/quotedPriceCopy',
         query:{
-          data:res.data
+          id:res.data.sa_quotedpriceid
         }
       })