Quellcode durchsuchen

项目商机关联客户新增调整,特殊说明字段优化

qymljy vor 9 Monaten
Ursprung
Commit
5a2bc0562a

+ 1 - 1
src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -47,7 +47,7 @@
         <el-descriptions-item :label="$t('材质')">{{ basic.material || '--'}}</el-descriptions-item>
         <el-descriptions-item :label="$t('装置')">{{ basic.device || '--'}}</el-descriptions-item>
         <el-descriptions-item :label="$t('产线')">{{ basic.prodline || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t('特殊说明')">{{ basic.specalnote || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t('备注')">{{ basic.specalnote || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`标准明细`)">{{ basic.standardsmx || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight || '--'}};{{$t(`净重`)}}:{{basic.weight || '--'}}</el-descriptions-item>

+ 2 - 2
src/HDrpManagement/ProductMag/modules/add.vue

@@ -217,8 +217,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('特殊说明')">
-                <el-input v-model="form.specalnote" type="textarea" :placeholder="$t(`输入特殊说明`)"></el-input>
+              <el-form-item :label="$t('备注')">
+                <el-input v-model="form.specalnote" type="textarea" :placeholder="$t(`输入备注`)"></el-input>
               </el-form-item>
             </el-col>
 <!--            <el-col :span="8">

+ 2 - 2
src/HDrpManagement/ProductMag/modules/edit.vue

@@ -219,8 +219,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('特殊说明')">
-                <el-input v-model="form.specalnote" type="textarea" :placeholder="$t(`输入特殊说明`)"></el-input>
+              <el-form-item :label="$t('备注')">
+                <el-input v-model="form.specalnote" type="textarea" :placeholder="$t(`输入备注`)"></el-input>
               </el-form-item>
             </el-col>
 <!--            <el-col :span="8">

+ 29 - 1
src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -24,7 +24,11 @@
             <span>{{$t(scope.column.data[scope.column.columnname])}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'enterprisename'">
-            <span v-if="scope.column.data.sa_agentsid === 0">{{$t(scope.column.data[scope.column.columnname])}}</span>
+            <span v-if="scope.column.data.sa_agentsid === 0">
+              <el-button type="text" size="mini" @click="goDetail(scope.column.data)">
+                {{$t(scope.column.data[scope.column.columnname])}}
+              </el-button>
+            </span>
             <span v-else>
               {{$t(scope.column.data[scope.column.columnname])}}
               <el-tag style="margin-left: 5px" type="warning" size="mini" v-for="item in scope.column.data.sa_agents_type" :key="item.index">{{$t(item)}}</el-tag>
@@ -84,6 +88,8 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      listqueryid:'',
+      pageTotal:0,
       search:"",
       params:{
         "id": 20221027143702,
@@ -112,6 +118,9 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -145,6 +154,25 @@ export default {
         }
       })
       this.enterpriseTypeList = res.data
+    },
+    goDetail(row){
+      let route = this.$route
+      if (route.path !== '/customerDetail') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      sessionStorage.setItem('listqueryid',this.listqueryid)
+      sessionStorage.setItem('isGo','1')
+      this.$router.push({
+        path:'/customerDetail',
+        query:{
+          id:row.sa_customersid,
+          rowindex:row.rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sa_customers'
+        }
+      })
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})
     }
   },
   mounted() {

+ 2 - 2
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -201,8 +201,8 @@
                   selectProduct.itemextend[0].prodline
                 }}</span>
               </el-col>
-              <el-col :span="8" v-if="selectProduct.itemextend[0].specalnote && siteid != 'HY'" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("特殊说明") }}:</span>
+              <el-col :span="8" style="margin-bottom: 10px">
+                <span class="search__label">{{ $t("备注") }}:</span>
                 <span class="tab-color">{{
                   selectProduct.itemextend[0].specalnote
                 }}</span>

+ 4 - 0
src/components/normal-basic-layout/index.vue

@@ -165,6 +165,10 @@ export default {
       this.currentPage = res.pageNumber
       /* 请求的数据暴露出去 二次处理 */
       this.$emit('listData',this.list)
+      console.log(this.list,'表格数据1*****11111')
+      // if (!this.list){
+      //   this.listData()
+      // }
 
       // 保存一下列表数据用于翻页
       let isGo = sessionStorage.getItem('isGo')