调整商品管理新增、编辑

src/HDrpManagement/ProductMag/modules/add.vue

@@ -110,17 +110,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="交期">
-                <el-input v-model="form.delivery" placeholder="输入交期(天)"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="保修期限">
-                <el-input v-model="form.warrantyday" placeholder="输入保修期限(年)"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="材质" >
                 <el-select style="width:100%" v-model="form.material" placeholder="请选择" clearable>
                   <el-option
@@ -132,6 +122,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="重量(kg)">
+                <el-input v-model="form.weight" placeholder="重量(kg)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="交期">
+                <el-input v-model="form.delivery" placeholder="输入交期(天)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="保修期限">
+                <el-input v-model="form.warrantyday" placeholder="输入保修期限(年)"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="12">
               <el-form-item label="满库存量">
                 <el-input v-model="form.stockstatus1" placeholder="满库存量"></el-input>
@@ -142,21 +148,16 @@
                 <el-input v-model="form.stockstatus2" placeholder="缺货提醒"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="工具">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.istool">是否工具</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="营销物料">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.iswuliao">是否物料</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="服务物料">
-                <el-checkbox :true-label="1" :false-label="0" v-model="form.isservice">是否服务物料</el-checkbox>
-              </el-form-item>
-            </el-col>
             <el-col :span="12">
               <el-form-item label="产线">
                 <el-input v-model="form.prodline" placeholder="输入产线"></el-input>
@@ -172,7 +173,7 @@
                 <el-input v-model="form.specalnote" type="textarea" placeholder="输入特殊说明"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">
               <el-form-item label="单品管理">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.skucontrol" @change="isauxunitChange">是否需要单品管理</el-checkbox>
               </el-form-item>
@@ -181,14 +182,19 @@
               <el-form-item label="批次管理">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.batchcontrol" @change="isauxunitChange">是否需要批次管理</el-checkbox>
               </el-form-item>
+            </el-col>-->
+            <el-col :span="12">
+              <el-form-item label="服务物料">
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.isservice">是否服务物料</el-checkbox>
+              </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="中线蝶阀">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isbutterfly"  >是否中线蝶阀</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
-              <el-form-item label="压力等级" v-if="form.isbutterfly == '1'">
+            <el-col :span="12" >
+              <el-form-item label="压力等级" >
                 <el-select style="width:100%" v-model="form.pressure" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in pressures"
@@ -199,8 +205,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="蝶板驱动" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="蝶板驱动" >
                 <el-select style="width:100%" v-model="form.butterflyplatedrive" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in butterflyplatedrive"
@@ -211,8 +217,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="连接形式" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="连接形式" >
                 <el-select style="width:100%" v-model="form.connection" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in connectionmode"
@@ -223,8 +229,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="阀板材质" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="阀板材质" >
                 <el-select style="width:100%" v-model="form.valveplatematerial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in valveplatematerial"
@@ -235,8 +241,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="阀体材质" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="阀体材质" >
                 <el-select style="width:100%" v-model="form.bodymaterial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in bodymaterial"
@@ -247,8 +253,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="执行器类型" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="执行器类型" >
                 <el-select style="width:100%" v-model="form.actuatortype" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatortype"
@@ -259,8 +265,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="执行器品牌" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="执行器品牌">
                 <el-select style="width:100%" v-model="form.actuatorbrand" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatorbrand"

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -110,17 +110,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="交期">
-                <el-input v-model="form.delivery" placeholder="输入交期"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="保修期限">
-                <el-input v-model="form.warrantyday" placeholder="输入保修期限"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="材质" >
                 <el-select style="width:100%" v-model="form.material" placeholder="请选择" clearable>
                   <el-option
@@ -132,6 +122,22 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="重量(kg)">
+                <el-input v-model="form.weight" placeholder="重量(kg)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="交期">
+                <el-input v-model="form.delivery" placeholder="输入交期"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="保修期限">
+                <el-input v-model="form.warrantyday" placeholder="输入保修期限"></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="12">
               <el-form-item label="满库存量">
                 <el-input v-model="form.stockstatus1" placeholder="满库存量"></el-input>
@@ -142,21 +148,17 @@
                 <el-input v-model="form.stockstatus2" placeholder="缺货提醒"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="工具">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.istool">是否工具</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="营销物料">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.iswuliao">是否物料</el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="服务物料">
-                <el-checkbox :true-label="1" :false-label="0" v-model="form.isservice">是否服务物料</el-checkbox>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="12">
               <el-form-item label="产线">
                 <el-input v-model="form.prodline" placeholder="输入产线"></el-input>
@@ -172,7 +174,7 @@
                 <el-input v-model="form.specalnote" type="textarea" placeholder="输入特殊说明"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+<!--            <el-col :span="8">
               <el-form-item label="单品管理">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.skucontrol" @change="isauxunitChange">是否需要单品管理</el-checkbox>
               </el-form-item>
@@ -181,17 +183,21 @@
               <el-form-item label="批次管理">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.batchcontrol" @change="isauxunitChange">是否需要批次管理</el-checkbox>
               </el-form-item>
+            </el-col>-->
+            <el-col :span="12">
+              <el-form-item label="服务物料">
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.isservice">是否服务物料</el-checkbox>
+              </el-form-item>
             </el-col>
 
-
-            <el-col :span="8">
+            <el-col :span="12">
               <el-form-item label="中线蝶阀">
                 <el-checkbox :true-label="1" :false-label="0" v-model="form.isbutterfly">是否中线蝶阀</el-checkbox>
               </el-form-item>
             </el-col>
             
-            <el-col :span="8">
-              <el-form-item label="压力等级" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="压力等级" >
                 <el-select style="width:100%" v-model="form.pressure" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in pressures"
@@ -203,8 +209,8 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
-              <el-form-item label="蝶板驱动" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="蝶板驱动" >
                 <el-select style="width:100%" v-model="form.butterflyplatedrive" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in butterflyplatedrive"
@@ -215,8 +221,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="连接形式" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="连接形式" >
                 <el-select style="width:100%" v-model="form.connection" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in connectionmode"
@@ -227,8 +233,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="阀板材质" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="阀板材质" >
                 <el-select style="width:100%" v-model="form.valveplatematerial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in valveplatematerial"
@@ -239,8 +245,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="阀体材质" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="阀体材质" >
                 <el-select style="width:100%" v-model="form.bodymaterial" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in bodymaterial"
@@ -251,8 +257,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="执行器类型" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="执行器类型" >
                 <el-select style="width:100%" v-model="form.actuatortype" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatortype"
@@ -263,8 +269,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="执行器品牌" v-if="form.isbutterfly == '1'">
+            <el-col :span="12">
+              <el-form-item label="执行器品牌" >
                 <el-select style="width:100%" v-model="form.actuatorbrand" placeholder="请选择" clearable>
                   <el-option
                     v-for="item in actuatorbrand"

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -45,7 +45,7 @@
               fixed>
             <template slot-scope="scope">
 <!--              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'&#45;&#45;':scope.row.depfullname}}</p>-->
-              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
+              <p >{{scope.row.depfullname}}</p>
             </template>
           </el-table-column>
           <el-table-column

src/HManagement/personalTarget/target/modules/edit/components/table.vue

@@ -14,7 +14,7 @@
         width="120"
         fixed>
         <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
+          <p >{{scope.row.depfullname}}</p>
         </template>
       </el-table-column>
       <el-table-column

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -47,7 +47,7 @@
               fixed>
             <template slot-scope="scope">
 <!--              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'&#45;&#45;':scope.row.depfullname}}</p>-->
-              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
+              <p >{{scope.row.depfullname}}</p>
             </template>
           </el-table-column>
           <el-table-column

src/HManagement/projectTarget/target/modules/edit/components/table.vue

@@ -13,7 +13,7 @@
         width="120"
         fixed>
         <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.depfullname}}</p>
+          <p >{{scope.row.depfullname}}</p>
         </template>
       </el-table-column>
       <el-table-column

src/SDrpManagement/QuotedPrice/index.vue

@@ -162,6 +162,20 @@ export default {
   methods:{
     selectChange(){
       this.tabIndex = this.tabName
+      let sort = [
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 71,
+          sortname: "默认"
+        },
+        {
+          reversed : 0,
+          sorted: 0,
+          sortid: 136,
+          sortname: "站点全部"
+        }
+      ]
       if (this.dateSelect !== '' && this.dateSelect !== null){
         this.selectParam.startdate = this.dateSelect[0]
         this.selectParam.enddate = this.dateSelect[1]
@@ -215,6 +229,7 @@ export default {
         "content": {}
       })
       this.editableTabs = res.data
+
       for (let i=0;i<res.data.length;i++){
         if (res.data[i].templetname == '站点全部'){
           this.tabName = res.data[i].templetid

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -11,7 +11,8 @@
         tags=""
         :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
         @pageChange="pageChange"
-        @onEditSuccess="onEditSuccess">
+        @onEditSuccess="onEditSuccess"
+        @sysTag="sysTag">
       <div slot="tags">
         <!-- 使用此插槽可不传[tags] -->
         <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
@@ -22,8 +23,10 @@
         <statusChange class="inline-16" v-if="tool.checkAuth($route.name,'statusChange')" :disabled="mainData.disabled" :id="mainData.sa_customersid"  @statusChangeSuccess="statusChangeSuccess"></statusChange>
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.sourcepoolname === ''" :disabled="mainData.disabled" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
         <toBack class="inline-16" v-if="tool.checkAuth($route.name,'back') && mainData.sa_customerpoolid_source !== 0" :disabled="mainData.disabled" :data="mainData" @backSuccess="onSuccess"></toBack>
+<!--        <duplicatesCustomer class="inline-16" v-if="tagFlag" :data="mainData"></duplicatesCustomer>-->
         <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" :disabled="mainData.disabled" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
         <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') && mainData.sa_customerpoolid_source !== 0 " :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
+
       </div>
       <div slot="slot0" >
         <detailed :data="mainData" ref="baseDetail"></detailed>
@@ -80,6 +83,7 @@ import toBack from "@/SDrpManagement/salerPrivatecustomer/detail/modules/operati
 import contract from './modules/contract/index'
 import accountMoney from './modules/accountMoney/index'
 import bankCard from './modules/bankCard/index'
+import duplicatesCustomer from "@/components/duplicatesData/duplicatesCustomer";
 export default {
   name: "detail",
   data() {
@@ -99,7 +103,8 @@ export default {
       },
       users:[],
       flag:false,
-      disabled:false
+      disabled:false,
+      tagFlag:false
     }
   },
   components:{
@@ -122,7 +127,8 @@ export default {
     toBack,
     contract,
     accountMoney,
-    bankCard
+    bankCard,
+    duplicatesCustomer
   },
   watch:{
    async mainData(val) {
@@ -283,6 +289,17 @@ export default {
     },
     onEditSuccess(){
       this.statusChangeSuccess()
+    },
+    sysTag(val){
+      console.log(val,'系统标签')
+      this.tagFlag = false
+      for (let i=0;i<val.length;i++){
+        if (val[i] == '疑似重复'){
+          this.tagFlag = true
+          break
+        }
+      }
+      console.log(this.tagFlag)
     }
   },
   mounted () {

src/components/duplicatesData/duplicatesCustomer.vue

@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <el-button size="mini" type="primary" @click="queryData">查看重复</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "duplicatesCustomer",
+  props:["data"],
+  data(){
+    return {
+      param:{
+        "id": 20221208172002,
+        "content": {
+          "sa_customersid":"",
+          "enterprisename":"",
+          "taxno":"",
+          "address":""
+        },
+      }
+    }
+  },
+  methods:{
+    async queryData(){
+      this.param.content.sa_customersid = this.data.sa_customersid
+      this.param.content.enterprisename = this.data.enterprisename
+      this.param.content.taxno = this.data.taxno
+      this.param.content.address = this.data.address
+      const res = await this.$api.requested(this.param)
+      console.log(res,'重复数据')
+    }
+  },
+  mounted() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/normal-basic-layout/details/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-align-start flex-between normal-margin" style="flex-wrap:nowrap">
         <div>
           <p class="main_title mt-10">{{titleText?titleText:'##'}}</p>
-          <tagTemp v-if="activeApp.isdatatag" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></tagTemp>
+          <tagTemp v-if="activeApp.isdatatag" ref="tag" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @sysTag="sysTag"></tagTemp>
         </div>
         <div class="flex-align-center" style="flex: 1 0 auto;  justify-content: flex-end;">
           <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
@@ -326,6 +326,10 @@ export default {
           reslove(-1)
         }
       })
+    },
+
+    sysTag(val){
+      this.$emit('sysTag',val)
     }
   },
   mounted () {

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -59,6 +59,7 @@ export default {
       this.option = res.data.option
       this.datatag = res.data.datatag
       this.systemtag = res.data.systemtag
+      this.$emit('sysTag',this.systemtag)
     },
     async addTag (val) {
       if (val === false) {