线索管理、公海线索新增字段、报价单新建编辑调整

src/Form/QuotedPrice/edit.vue

@@ -138,7 +138,7 @@
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  :readonly="true"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                  <el-input slot="reference"  :readonly="true"  v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户" :disabled="form.sa_projectid === ''" @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -315,7 +315,7 @@
                         :total="contacts.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference"  :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference"  :readonly="true" v-model="form.contactsname" autocomplete="off" placeholder="请选择联系人" :disabled="form.sys_enterpriseid === ''"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -652,7 +652,7 @@ export default {
         this.tool.showMessage(res,() => {
           this.$store.commit('setLoading',false)
           this.drawer = false
-          this.changeData(this.productObj)
+         /* this.changeData(this.productObj)*/
 
         })
       })

src/HManagement/accountManage/modules/account_detail.vue

@@ -110,11 +110,12 @@ export default {
     async getAccountInfo () {
       let res
       if (this.mainData.usertype === 1 || this.mainData.usertype === 0) {
+        console.log(this.mainData,'mainData')
         res = await this.$api.requested({
           "classname":"webmanage.hr.hr",
           "method": "query_hrMain",
           "content": {
-            hrid:this.mainData.hrmsg.hrid
+            hrid:this.mainData.hrmsg.hrid || 0
           }
         })
         this.accountInfo = res.data

src/HManagement/clueManage/clue_public/modules/distobutionOne.vue

@@ -12,6 +12,21 @@
             <div v-if="scope.column.columnname === 'ismatch'">
               <p :style="scope.column.data.ismatch === 1?'color:#52c41a':''">{{scope.column.data.ismatch === 1?'是':'否'}}</p>
             </div>
+            <div v-else-if="scope.column.columnname === 'tag'">
+              <div v-if="scope.column.data.sys_tag">
+                <div v-for="item in scope.column.data.sys_tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+                <div v-for="item in scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+              </div>
+              <div v-else></div>
+            </div>
             <div v-else-if="scope.column.columnname === 'province'">
               <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
             </div>

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -14,6 +14,21 @@
               </div>
               <p class="tips" v-else>未匹配</p>
             </div>
+            <div v-else-if="scope.column.columnname === 'tag'">
+              <div v-if="scope.column.data.sys_tag">
+                <div v-for="item in scope.column.data.sys_tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+                <div v-for="item in scope.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+                  <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
+                    <span>{{item}}</span>
+                  </el-tag>
+                </div>
+              </div>
+              <div v-else></div>
+            </div>
             <div v-else-if="scope.column.columnname === 'province'">
               <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
             </div>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -137,7 +137,7 @@
                         :total="customer.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>
+                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户" :disabled="form.sa_projectid === ''"  @input="selectCustomer"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -314,7 +314,7 @@
                         :total="contacts.total">
                     </el-pagination>
                   </div>
-                  <el-input slot="reference" :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人"  @input="selectContacts"></el-input>
+                  <el-input slot="reference" :readonly="true" v-model="form.name" autocomplete="off" placeholder="请选择联系人" :disabled="form.sys_enterpriseid === ''"  @input="selectContacts"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -527,7 +527,7 @@ export default {
         sa_quotedpriceid:0,     //sat_notice_classid<=0时 为新增
         sys_enterpriseid: "",
         contactsid:0,
-        sa_projectid: "0",
+        sa_projectid: "",
         discountrate: '',
         remarks: "",
         invaliddate: "",