【修改】bug

src/views/sales_policy/components/AddCondition.vue

@@ -538,6 +538,7 @@ export default {
   created() {
     this.getCommonApi();
   },
+
   computed: mapState({
     comCode: (state) => state.sales.code,
   }),
@@ -570,11 +571,14 @@ export default {
       // 如果没有返回值则默认返回false(全部无法选中)
     },
     async getCommonApi(policyId) {
+
       if (this.id || policyId) {
-        this.edit = "eidt";
+        if (policyId) {
+           this.edit = "eidt";
+        }
 
         const res = await getConditionMaterialDetail({
-          id: this.policyId || policyId,
+          id: this.policyId || policyId || this.id,
         });
         this.pop = res.data.pop;
         let pop = res.data.pop.split(":");

src/views/sales_policy/components/editPolicy.vue

@@ -440,6 +440,13 @@
                   size="mini"
                   @click="handleCondition(scope.row.id, scope.$index)"
                 >删除</el-button>
+                 <el-button
+                  type="text"
+                  size="mini"
+                  @click="
+                  catCond(scope.row)
+                  "
+                >查看条件</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -464,6 +471,8 @@
 
       @handleSubmitCon="handleSubmitCon"
     />
+    <AddCondition ref="cond" v-show="isCondition === 2"   :id="cid"  />
+
   </div>
 </template>
 
@@ -489,6 +498,8 @@ import { downloadFiles, handleImport } from '@/utils/util'
 // import Transfer from './Transfer'
 import TabelTransfer from './TabelTransfer'
 import AddCondition from './AddCondition'
+import EditCondition from './EditCondition'
+
 import ImageUpload from '@/components/Common/image-upload.vue'
 
 export default {
@@ -585,6 +596,7 @@ export default {
     if (this.$parent.isFlag) {
       // this.handletwoList()
     }
+
   },
   methods: {
     ...mapMutations('sales', ['initData']),
@@ -602,6 +614,15 @@ export default {
         this.$successMsg('删除成功')
       })
     },
+    catCond(row){
+      this.cid = row.id
+      this.$refs.cond.getCommonApi()
+      this.isCondition = 2
+
+            // $refs.cond.getCommonApi(),
+            //         (), (cid = scope.row.id)
+
+    },
     handleAddCondition() {
       this.isCondition = 1
       console.log(this.conditionList[0].id,this.searchForm.code);
@@ -1017,6 +1038,7 @@ export default {
     // Transfer,
     AddCondition,
     ImageUpload,
+    EditCondition,
     TabelTransfer
   }
 }

src/views/supply/apply/components/engin_form.vue

@@ -54,6 +54,11 @@
             <el-input v-model="mainForm.enginName" placeholder="请输入家用项目类别" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
+            <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="商用项目名称" prop="refProjectName">
+            <el-input v-model="mainForm.refProjectName" placeholder="请输入商用项目名称" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录类型" prop="loginType">
             <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型"></el-input>
@@ -191,6 +196,11 @@
               <el-input v-model="screenForm.enginName" placeholder="请输入家用项目类别"></el-input>
             </el-form-item>
           </el-col>
+           <!-- <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="商用项项目名称" prop="refProjectName">
+            <el-input v-model="screenForm.refProjectName" placeholder="请输入家用项目类别" :disabled="isDealer"></el-input>
+          </el-form-item>
+        </el-col> -->
           <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="model" label="规格型号">
               <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
@@ -241,7 +251,11 @@
             </template>
           </el-table-column>
           <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="表头登录类型" prop="refPromiseStatus" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="项目类别" prop="refProjectType" min-width="200" show-overflow-tooltip></el-table-column>
+                  <el-table-column align="center" label="行业类别" prop="refTradeCategory" min-width="200" show-overflow-tooltip></el-table-column>
+
+        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -343,6 +357,7 @@ export default {
         createMan: '',
         createDate: '',
         examineRemark: '',
+        refProjectName:""
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -360,6 +375,7 @@ export default {
         date: '',
         warehouse: '',
         type: '',
+        refProjectName:""
       },
       currentPage: 1,
       listTotal: 0,
@@ -444,7 +460,9 @@ export default {
         this.mainForm.remark = data.remark;
         this.mainForm.examineRemark = data.approvalRemark;
         this.mainForm.fileNo = data.fileNo
+        this.mainForm.refProjectName = data.refProjectName
         this.screenForm.warehouse = data.correspondId;
+        // this.screenForm.refProjectName = data.refProjectName
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,
           name: data.fileName,

src/views/supply/engin/components/commerce_detail.vue

@@ -46,7 +46,7 @@
             </el-col>
              <el-col :span="8" class="item">
               <div class="label">工程编号</div>
-              <div class="value">{{detailData.enginNum}}</div>
+              <div class="value">{{detailData.refProjectNo}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>

src/views/supply/engin/components/home_detail.vue

@@ -48,6 +48,7 @@
               <div class="label">跨区厂编号</div>
               <div class="value">{{detailData.refFactoryNo}}</div>
             </el-col>
+
             <el-col :span="8" class="item">
               <div class="label">使用单位</div>
               <div class="value">{{detailData.refUseUnit}}</div>

src/views/supply/engin/engin_list.vue

@@ -185,7 +185,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
-             <el-table-column align="left" label="业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+             <!-- <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/policy/policy_list.vue

@@ -99,8 +99,20 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="serviceId">
+                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="small" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -620,7 +632,9 @@ export default {
         status: '',
         salesMan:'',
         isDirectTransfer:null,
-        specification:''
+        specification:'',
+        k3ServiceId:'',
+        serviceId:''
       },
       transfer:[
         {label:'是',value:true},
@@ -746,7 +760,8 @@ export default {
         createBy: this.screenForm.zbMan,
         status: true,
         examineBy: this.screenForm.shMan,
-        serviceId:this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         isDirectTransfer: this.screenForm.isDirectTransfer,
         specification:this.screenForm.specification,
         type: 2 // 1:普通零售单，2:政策零售单