Pārlūkot izejas kodu

线索调整,转站点调整

qymljy 2 gadi atpakaļ
vecāks
revīzija
9b8fd3f141

+ 28 - 28
src/HDrpManagement/ProductMag/index.vue

@@ -1,12 +1,12 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'HDrpManagement/ProductMag/modules'
       }"
-      tableName="productManageTable" 
+      tableName="productManageTable"
       idName="itemid"
       ownertable="plm_item"
       :apiId="{query:20220923140602,del:20220923152202}"
@@ -26,31 +26,31 @@
         <counter_examine v-if="tool.checkAuth($route.name,'reverseReview')" class="inline-16" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></counter_examine>
         <priceLevelSetting class="inline-16" v-if="tool.checkAuth($route.name,'priceSet')" ></priceLevelSetting>
         <el-button class="inline-16" size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
-        <importFile 
+        <importFile
           v-if="tool.checkAuth($route.name,'export')"
-          ref="importFile" 
-          class="inline-16" 
-          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}" 
-          :errorUrl="errorUrl" 
-          @clearUrl="errorUrl = null" 
+          ref="importFile"
+          class="inline-16"
+          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}"
+          :errorUrl="errorUrl"
+          @clearUrl="errorUrl = null"
           @onSuccess="bindImportOrder"
         ></importFile>
-        <importImage 
+        <importImage
           v-if="tool.checkAuth($route.name,'exportImage')"
-          ref="importImage" 
-          class="inline-16" 
-          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}" 
-          :errorUrl="errorUrl" 
-          @clearUrl="errorUrl = null" 
+          ref="importImage"
+          class="inline-16"
+          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}"
+          :errorUrl="errorUrl"
+          @clearUrl="errorUrl = null"
           @onSuccess="bindImportImage"
         ></importImage>
         <importInfo
           v-if="tool.checkAuth($route.name,'exportInfo')"
-          ref="importImage" 
-          class="inline-16" 
-          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}" 
-          :errorUrl="errorUrl" 
-          @clearUrl="errorUrl = null" 
+          ref="importImage"
+          class="inline-16"
+          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}"
+          :errorUrl="errorUrl"
+          @clearUrl="errorUrl = null"
           @onSuccess="bindImportInfo"
         ></importInfo>
       </template>
@@ -149,14 +149,14 @@
          </span>
         </p>
         <p v-else-if="scope.data.column.columnname === 'itemclass'">
-        <span v-if="JSON.stringify(scope.data.column.data.itemclass) !== '[]' && scope.data.column.data.itemclass">
-           <span v-for="item in scope.data.column.data.itemclass" :key="item.index">
-             <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassfullname}}</el-tag>
+          <span v-if="JSON.stringify(scope.data.column.data.itemclass) !== '[]' && scope.data.column.data.itemclass">
+             <span v-for="item in scope.data.column.data.itemclass" :key="item.index">
+               <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassfullname}}</el-tag>
+            </span>
           </span>
-        </span>
           <span v-else>
 
-       </span>
+          </span>
         </p>
         <p v-else-if="scope.data.column.columnname === 'istool'">
           {{scope.data.column.data[[scope.data.column.columnname]] === 0?'否':'是'}}
@@ -181,8 +181,8 @@
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
  * @param {string} tableName 开发端配置的表格名称
  * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+ * @param {Array} options:{label:描述,value:值}
  */
 import previewImage from '@/components/previewImage/index'
 import editTemp from './modules/edit.vue'
@@ -380,4 +380,4 @@ export default {
   width: 38px;
   margin-top:0;
 }
-</style>
+</style>

+ 12 - 2
src/HDrpManagement/prodectFileData/components/add.vue

@@ -28,6 +28,16 @@
               <span style="color:#52C41A" v-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
               <span style="color:#000000" v-else-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
             </p>
+            <p v-else-if="scope.column.columnname === 'itemclass'">
+              <span v-if="JSON.stringify(scope.column.data.itemclass) !== '[]' && scope.column.data.itemclass">
+                 <span v-for="item in scope.column.data.itemclass" :key="item.index">
+                   <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassfullname}}</el-tag>
+                </span>
+              </span>
+              <span v-else>
+
+              </span>
+            </p>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
 
@@ -104,7 +114,7 @@ export default {
 
   },
   created() {
-    this.tablecols = this.tool.tabelCol(this.$route.name).relationProductTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
   },
   methods: {
     onShow(){
@@ -192,4 +202,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 12 - 2
src/HDrpManagement/prodectFileData/components/relationList.vue

@@ -15,6 +15,16 @@
           <span style="color:#52C41A" v-if="scope.column.data[[scope.column.columnname]] == '审核'">{{scope.column.data[[scope.column.columnname]]}}</span>
           <span style="color:#000000" v-else-if="scope.column.data[[scope.column.columnname]] == '新建'">{{scope.column.data[[scope.column.columnname]]}}</span>
         </p>
+        <p v-else-if="scope.column.columnname === 'itemclass'">
+          <span v-if="JSON.stringify(scope.column.data.itemclass) !== '[]' && scope.column.data.itemclass">
+             <span v-for="item in scope.column.data.itemclass" :key="item.index">
+               <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{item.itemclassfullname}}</el-tag>
+            </span>
+          </span>
+          <span v-else>
+
+          </span>
+        </p>
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
@@ -77,7 +87,7 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(this.currentPage);
-      
+
       console.log(res)
     },
     handleSizeChange(val) {
@@ -103,4 +113,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 4 - 0
src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -338,6 +338,10 @@ export default {
             label:'所属业务员',
             value:this.mainData.salename
           },
+          {
+            label:'上图员',
+            value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
+          },
           {
             label:'负责人',
             value:this.mainData.allocationstatus === '已分配'?this.mainData.leader[0].name:'--'

+ 4 - 0
src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -215,6 +215,10 @@ export default {
           label:'所属业务员',
           value:this.mainData.enterprisename
         },
+        {
+          label:'上图员',
+          value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
+        },
         {
           label:'负责人',
           value:this.mainData.leader && this.mainData.leader.length > 0 ? this.mainData.leader[0].name : ''

+ 3 - 3
src/HManagement/personalTarget/target/modules/add.vue

@@ -4,7 +4,7 @@
     <el-dialog
         title="新建人员目标年度"
         :visible.sync="dialogTableVisible"
-        width="20%"
+        width="370px"
         append-to-body
         @close="onCancel"
         >
@@ -83,7 +83,7 @@
           <el-button size="small" type="primary" :disabled="selection.length === 0" @click="onSubmit" class="normal-btn-width">确 定</el-button>
         </div>
       </div>
-      
+
     </el-drawer>-->
   </div>
 </template>
@@ -236,4 +236,4 @@ export default {
     font-size: 16px;
     color: #303133;
   }
-</style>
+</style>

+ 2 - 2
src/HManagement/projectTarget/target/modules/add.vue

@@ -4,7 +4,7 @@
     <el-dialog
         title="新建项目目标年度"
         :visible.sync="dialogTableVisible"
-        width="20%"
+        width="370px"
         append-to-body
         @close="onCancel"
     >
@@ -166,4 +166,4 @@ export default {
     font-size: 16px;
     color: #303133;
   }
-</style>
+</style>

+ 5 - 1
src/SManagement/orderclue_detail/index.vue

@@ -181,7 +181,7 @@ export default {
           value:this.mainData.campaign_name
         },
         {
-          label:'领域',
+          label:'领dd域',
           value:this.mainData.tradefield
         },
         {
@@ -311,6 +311,10 @@ export default {
             label:'所属业务员',
             value:this.mainData.salename
           },
+          {
+            label:'上图员',
+            value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
+          },
           {
             label:'负责人',
             value:this.mainData.leader.length > 0 && this.mainData.leader[0].name