浏览代码

【修改】 工程收差调价列表/价格列表

howie 2 年之前
父节点
当前提交
3f354377de

+ 14 - 1
src/views/deposit_home/components/refund_list-detail.vue

@@ -595,7 +595,20 @@
               prop="dataQty"
               min-width="160"
               show-overflow-tooltip
-            />
+            >
+            <template slot-scope="scope">
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.dataQty }}
+                </template>
+                <el-input
+                  v-else
+                  class="inpt"
+                  v-model="scope.row.dataQty"
+                  size="mini"
+                  clearable
+                ></el-input>
+              </template>
+          </el-table-column>
             <el-table-column
               align="right"
               label="收差全额"

+ 2 - 2
src/views/deposit_home/deposit_list.vue

@@ -396,9 +396,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column> -->
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
               label="是否退押"

+ 2 - 2
src/views/deposit_home/refund_list.vue

@@ -572,9 +572,9 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column> -->
+            <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
               label="是否退押"

+ 34 - 21
src/views/supply/policy/components/retail_form.vue

@@ -1164,6 +1164,7 @@ export default {
       const type = this.policyList.filter((k) => {
         return k.code === e;
       })[0].type;
+      console.log(type=="PROVISION");
       if (type == "PROVISION") {
         // PROVISION 配提
         //   选择销售政策PolidcyId改变获取条件列表
@@ -1231,27 +1232,10 @@ export default {
       })
        this.policyList = data.records
         if (data.records.length) {
-          this.handlePolicy(data.records[0].id);
+          this.handlePolicy(data.records[0].code);
         }
     },
-    // 引用销售政策搜索
-    async handlePolicyTypeList() {
-      if (!this.screenForm.policyId) {
-        this.$errorMsg("请选择销售政策");
-        return;
-      }
-      if (this.popArr.length) {
-        this.popDataArr = [];
-        this.dataList = [];
 
-        for (let i = 0; i < this.popArr.length; i++) {
-          await this.getConditionList(this.policyConditionId, i + 1, false);
-        }
-      } else {
-        // sProvision = true
-        this.getMaterialTypeList("sProvision");
-      }
-    },
     // 获取某一个比例下的数据 ,查询popType 当前 this.cusIndex+1
     async getConditionList(policyConditionId, popType, fang) {
       this.listLoading = true;
@@ -1290,10 +1274,12 @@ export default {
       }
       // this.total = data.total;
       // console.log(this.goodsList,'4555');
+
       if (this.goodsList.length) {
         for (let p = 0; p < this.goodsList.length; p++) {
           for (let q = 0; q < datas.length; q++) {
-            if (this.goodsList[p].id == datas[q].id) {
+            if ((this.goodsList[p].id || this.goodsList[p].policyMaterialId) == datas[q].id ) {
+
               this.$set(datas[q], "disabled", true);
             }
           }
@@ -1313,6 +1299,7 @@ export default {
       if (fang) {
         this.popDataArr[popType] = datas;
       } else {
+        console.log(datas,'89');
         this.popDataArr.push(datas);
       }
       this.totalArr.push({
@@ -1354,7 +1341,7 @@ export default {
           res.data.records[i].userList = this.userList;
           res.data.records[i].policyMaterialId = res.data.records[i].id;
           for (let j = 0; j < this.goodsList.length; j++) {
-            if (this.goodsList[j].id == res.data.records[i].id) {
+            if ((this.goodsList[j].id || this.goodsList[j].policyMaterialId) == res.data.records[i].id) {
               res.data.records[i].disabled = false;
             }
           }
@@ -1690,11 +1677,37 @@ export default {
         }
 
         this.policyList = res.data.records;
+        console.log( res.data.records);
         if (this.policyList.length) {
-          this.handlePolicy(this.screenForm.policyId);
+          this.handlePolicy(res.data.records[0].id)
+        // const type =  this.policyList.find(e=>e.code==this.screenForm.policyId).type
+
+        // if (type === "PROVISION") {
+        //       // this.handlePolicy( res.data.records[0].id);
+        // }else{
+
+        //  }
         }
       });
     },
+     // 引用销售政策搜索
+    async handlePolicyTypeList() {
+      if (!this.screenForm.policyId) {
+        this.$errorMsg("请选择销售政策");
+        return;
+      }
+      if (this.popArr.length) {
+        this.popDataArr = [];
+        this.dataList = [];
+
+        for (let i = 0; i < this.popArr.length; i++) {
+          await this.getConditionList(this.policyConditionId, i + 1, false);
+        }
+      } else {
+        // sProvision = true
+        this.getMaterialTypeList("sProvision");
+      }
+    },
     // 获取销售类型
     getTypeList() {
       const params = {

+ 9 - 9
src/views/supply/price/difference_modify_list.vue

@@ -286,28 +286,28 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="right"
               label="数量"
               prop="qty"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="right"
-              label="批发价"
+              label="价"
               prop="batchPrice"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column
               align="right"
               label="格力折扣"
               prop="discAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="left"
               label="调价日期"
@@ -341,7 +341,7 @@
                 <el-tag size="mini"  type="danger" v-else>否</el-tag>
               </template>
             </el-table-column> -->
-            <el-table-column
+            <!-- <el-table-column
               align="left"
               label="返利类型(钱包)"
               prop="wallets"
@@ -365,8 +365,8 @@
                 </template>
 
               </template>
-            </el-table-column>
-            <el-table-column
+            </el-table-column> -->
+            <!-- <el-table-column
               align="left"
               label="现金钱包"
               prop="modifyPriceDepartment"
@@ -391,7 +391,7 @@
                 </template>
 
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="left"
               label="调价部门"

+ 9 - 9
src/views/supply/price/difference_price_list.vue

@@ -142,11 +142,11 @@
           @click="handleRevokeAll"
           >批量作废</el-button
         >
-        <ExportButton
+        <!-- <ExportButton
           :exUrl="'product-upd-price/export'"
           :exParams="exParams"
           class="exp"
-        />
+        /> -->
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
       <div class="fl">
@@ -253,7 +253,7 @@
             min-width="160"
             show-overflow-tooltip
           />
-          <el-table-column
+          <!-- <el-table-column
             align="left"
             label="数量下限"
             prop="qty"
@@ -303,7 +303,7 @@
                 </template>
               </template>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="left"
             label="生效日期"
@@ -319,7 +319,7 @@
             min-width="160"
             show-overflow-tooltip
           />
-          <el-table-column
+          <!-- <el-table-column
             align="left"
             label="是否销价"
             prop="isPromote"
@@ -332,7 +332,7 @@
               >
               <el-tag size="mini" v-else type="danger">否</el-tag>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="left"
             label="是否作废"
@@ -349,18 +349,18 @@
           </el-table-column>
           <el-table-column
             align="right"
-            label="批发价1"
+            label="单价"
             prop="batchPrice"
             min-width="160"
             show-overflow-tooltip
           />
-          <el-table-column
+          <!-- <el-table-column
             align="right"
             label="格力折扣"
             prop="discAmount"
             min-width="160"
             show-overflow-tooltip
-          />
+          /> -->
           <el-table-column
             align="left"
             label="备注"