howie 3 лет назад
Родитель
Сommit
efd8ec7d2d

+ 6 - 2
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>

+ 4 - 4
src/views/supply/apply/components/engin_detail.vue

@@ -37,10 +37,10 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
-        <!-- <el-col :span="8" class="item">
+        <el-col :span="8" class="item">
             <div class="label">文件编码</div>
             <div class="value">{{detailData.itemFileNo}}</div>
-          </el-col> -->
+          </el-col>
 
 
           <el-col :span="8" class="item">
@@ -142,8 +142,8 @@
           <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="left" label="文件编号" prop="itemFileNo" 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-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.singlePayPrice | numToFixed}}

+ 4 - 0
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>

+ 10 - 3
src/views/supply/policy/components/retail_form.vue

@@ -63,6 +63,11 @@
             />
           </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
@@ -785,6 +790,7 @@ export default {
         type: '',
         ztype: '',
         remark: '',
+        fileNum:'',
         policyCode: '',
         policyRemark: '',
         policyId: '',
@@ -1475,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) => {
@@ -1844,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) {

+ 2 - 2
src/views/supply/retail/components/retail_detail.vue

@@ -196,8 +196,8 @@
         <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="left" label="文件编号" prop="fileNo" min-width="200" 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>