Merge remote-tracking branch 'origin/develop' into develop

src/views/basic_data/dealer/dealer_stock.vue

@@ -28,10 +28,12 @@
         </el-popconfirm>
       </div>
       <div class="fr">
+           <el-button type="primary" size="mini" @click="downLoadFns">导出</el-button>
         <el-button type="primary" size="mini" @click="downLoadFn">下载模板</el-button>
         <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
           <el-button type="primary" size="mini">导入</el-button>
         </el-upload>
+
       </div>
     </div>
 
@@ -347,7 +349,10 @@ export default {
     downLoadFn() {
       downloadFiles("/customer/pt/download");
     },
-
+ //下载模板
+    downLoadFns() {
+      downloadFiles("/customer/pt/export");
+    },
     // //改变产品大类
     // changeSelectFn(value) {
     //   // const res = this.categoryList.filter((v) => v.productCategoryId == value);

src/views/basic_data/stock/product_list.vue

@@ -94,6 +94,13 @@
             min-width="100"
             show-overflow-tooltip
           />
+            <el-table-column
+            align="left"
+            label="存货类别"
+            prop="categoryName"
+            min-width="100"
+            show-overflow-tooltip
+          />
           <el-table-column
             align="left"
             label="物料代码"

src/views/sales_policy/components/Examine.vue

@@ -709,7 +709,7 @@
                 type="primary"
                 size="small"
                 @click="handleSubmit"
-              >审核通过</el-button>
+              >审核</el-button>
             </el-row>
           </div>
         </div>

src/views/sales_policy/components/details.vue

@@ -55,10 +55,14 @@
               <div class="label">备注</div>
               <div class="value">
                 {{detail.remark}}
-
               </div>
             </el-col>
-
+            <el-col :span="24" class="item"  v-if="detail.examineStatus='SAVE'&& detail.examineTime != null ">
+              <div class="label">驳回原因</div>
+              <div class="value">
+                {{detail.examineRemark}}
+              </div>
+            </el-col>
             <el-col :span="8" class="item">
               <div class="label">制单人</div>
               <div class="value">{{ detail.createBy }}</div>

src/views/supply/apply/apply_list.vue

@@ -191,6 +191,12 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <el-table-column align="left" label="政策说明" prop="policyTitle" min-width="350" show-overflow-tooltip>
+
+            </el-table-column>
+               <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip>
+
+            </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

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

@@ -33,10 +33,15 @@
             <div class="label">仓库</div>
             <div class="value">{{detailData.correspondName}}</div>
           </el-col>
+            <el-col :span="12" class="item">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.itemFileNo}}</div>
+          </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>
             <div class="value">{{detailData.remark}}</div>
           </el-col>
+
           <el-col :span="24" class="item file">
             <div class="label">附件</div>
             <div class="value">
@@ -119,6 +124,8 @@
               {{scope.row.totalDiscAmount | numToFixed}}
             </template>
           </el-table-column>
+          <el-table-column align="right" label="政策说明" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
+
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip v-if="detailData.type !== 2"></el-table-column>

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

@@ -37,6 +37,10 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
+        <el-col :span="8" class="item">
+            <div class="label">文件编码</div>
+            <div class="value">{{detailData.itemFileNo}}</div>
+          </el-col>
 
 
           <el-col :span="8" class="item">
@@ -51,7 +55,7 @@
             <div class="label">使用单位</div>
             <div class="value">{{detailData.refUseUnit}}</div>
           </el-col>
-           <el-col :span="8" class="item">
+           <el-col :span="24" class="item">
             <div class="label">行业类别</div>
             <div class="value">{{detailData.refTradeCategory}}</div>
           </el-col>
@@ -138,7 +142,9 @@
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+             <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column> -->
+         <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.singlePayPrice | numToFixed}}
             </template>

src/views/supply/apply/engin_list.vue

@@ -210,7 +210,9 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column>
+          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.singlePayPrice | numToFixed}}
               </template>

src/views/supply/deliver/components/deliver_detail.vue

@@ -128,7 +128,8 @@
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+
+        <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="含税单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/supply/deliver/deliver_list.vue

@@ -148,6 +148,7 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+            <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip/> -->
             <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}

src/views/supply/deliver/sum_list.vue

@@ -245,6 +245,9 @@
             <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
                    <el-table-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="经销商现金钱包" prop="customerWalletName" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="经销商返利钱包" prop="customerWalletName2" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip></el-table-column>
 
 
         </el-table>

src/views/supply/policy/components/retail_detail.vue

@@ -41,6 +41,10 @@
             <div class="label">业务员</div>
             <div class="value">{{ detailData.k3ServiceName }}</div>
           </el-col>
+            <el-col :span="8" class="item">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col>
           <el-col :span="8" class="item">
             <div class="label">制单人</div>
             <div class="value">{{ detailData.createName }}</div>

src/views/supply/policy/components/retail_form.vue

@@ -63,12 +63,18 @@
             />
           </el-form-item>
         </el-col>
+          <el-col :xs="24" :sm="12" :lg="12">
+          <el-form-item label="文件编号" prop="fileNum">
+            <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="12" :lg="12">
           <el-form-item label="业务员" prop="k3ServiceName">
             <el-select
               v-model="mainForm.k3ServiceName"
               placeholder="选择业务员"
               style="width: 100%"
+              filterable
               @change="handleUser"
             >
               <el-option
@@ -784,6 +790,7 @@ export default {
         type: '',
         ztype: '',
         remark: '',
+        fileNum:'',
         policyCode: '',
         policyRemark: '',
         policyId: '',
@@ -1474,7 +1481,8 @@ export default {
           this.mainForm.policyId = data.policyId
           this.policyId = data.policyId
           this.mainForm.k3ServiceName = data.k3ServiceName
-          this.mainForm.k3ServiceId = data.k3ServiceId
+          this.mainForm.k3ServiceId = data.k3ServiceId,
+          this.mainForm.fileNum = data.fileNum
           // this.mainForm.k3ServiceName = data.retailOrderItemList[0].wallets[0].serviceName
           // this.mainForm.k3ServiceId = data.retailOrderItemList[0].wallets[0].serviceId
           data.retailOrderItemList.forEach((item) => {
@@ -1843,8 +1851,8 @@ export default {
             remark: this.mainForm.remark,
             type: 2, // 1:普通零售单，2:政策零售单
             retailOrderItemList: this.goodsList,
-            policyId: this.policyId
-
+            policyId: this.policyId,
+            fileNum:this.mainForm.fileNum
           }
           console.log(params)
           if (this.listItem) {

src/views/supply/retail/components/retail_detail.vue

@@ -90,7 +90,9 @@
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+                       <el-table-column align="center" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+
+        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
             </template>
@@ -196,7 +198,9 @@
         <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>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+         <!-- <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column> -->
+      <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="直调数量" prop="adjustNum" min-width="100" show-overflow-tooltip>

src/views/supply/retail/components/retail_examine.vue

@@ -69,7 +69,10 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+               <el-table-column align="center" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+
+
+       <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>

src/views/supply/retail/components/retail_form.vue

@@ -95,7 +95,9 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+        <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column>
+      <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
@@ -367,6 +369,7 @@ export default {
         proModel: '',
         price1: '',
         price2: '',
+        fileNum:''
       },
       currentPage: 1,
       listTotal: 0,
@@ -467,6 +470,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.fileNum = data.fileNo;
         this.mainForm.remark = data.remark;
+        this.mainForm.fileNum = data.fileNum
         data.retailOrderItemList.forEach(item => {
           item.status1 = '';
           item.status2 = '';