Finish Hotfix-zh-78

src/layout/components/AppMain.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive max="1">
+      <keep-alive >
         <router-view />
       </keep-alive>
     </transition>

src/views/basic_data/material/components/modify_list-apply.vue

@@ -310,7 +310,7 @@
               </el-form-item>
             </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="是否促销价"
               prop="isPromote"
@@ -331,7 +331,7 @@
                 </el-select>
               </el-form-item>
             </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="center"
               label="数量"
@@ -768,6 +768,14 @@
                 />
               </el-form-item>
             </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="物料编码" prop="materialNumber">
+                <el-input
+                  v-model="screenForm.materialNumber"
+                  placeholder="请输入物料编码"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格" prop="specification">
                 <el-input
@@ -926,7 +934,8 @@ export default {
       listLoading: false,
       screenForm: {
         keyword: '',
-        specification: ''
+        specification: '',
+        materialNumber:''
       },
       base: {
         adminCompanyId: '',
@@ -1217,7 +1226,8 @@ export default {
         pageSize: 10 || this.pageSize,
         keyword: this.screenForm.keyword,
         specification: this.screenForm.specification,
-        bindMain: true
+        materialNumber:this.screenForm.materialNumber,
+        bindMain: true,
       }
       getMaterialList(params).then((res) => {
         this.dataList = res.data.records

src/views/basic_data/material/components/modify_list-approval.vue

@@ -171,7 +171,7 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 align="center"
                 label="是否促销价"
                 prop="isPromote"
@@ -182,7 +182,7 @@
                   <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
                   <el-tag type="danger" v-else>否</el-tag>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 align="center"
                 label="数量"

src/views/basic_data/material/components/modify_list-detail.vue

@@ -166,7 +166,7 @@
                 show-overflow-tooltip
               >
               </el-table-column>
-              <el-table-column
+              <!-- <el-table-column
                 align="center"
                 label="是否促销价"
                 prop="isPromote"
@@ -177,7 +177,7 @@
                   <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
                   <el-tag type="danger" v-else>否</el-tag>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 align="center"
                 label="数量"

src/views/basic_data/material/modify_list.vue

@@ -288,7 +288,7 @@
               min-width="200"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+           <!-- <el-table-column
               align="left"
               label="是否促销价"
               prop="isPromote"
@@ -297,9 +297,9 @@
             >
               <template slot-scope="scope">
                 <el-tag size="mini" type="success" v-if="scope.row.isPromote">是</el-tag>
-                <el-tag size="mini" type="danger" v-else>否</el-tag>
+                <el-tag size="mini"  type="danger" v-else>否</el-tag>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="left"
               label="返利类型（钱包）"

src/views/basic_data/material/price_list.vue

@@ -97,6 +97,14 @@
               />
             </el-form-item>
           </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="备注" prop="specification">
+              <el-input
+                v-model="screenForm.remark"
+                placeholder="请输入备注"
+              />
+            </el-form-item>
+          </el-col>
 
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
@@ -371,7 +379,8 @@ export default {
         materialOldNumber: '',
         saleTypeId: '',
         specification: '',
-        startDate: ''
+        startDate: '',
+        remark:''
       },
       ztypeList: [],
       dictList: {}
@@ -408,7 +417,8 @@ export default {
         materialOldNumber: this.screenForm.materialOldNumber,
         saleTypeId: this.screenForm.saleTypeId,
         specification: this.screenForm.specification,
-        startDate: this.screenForm.startDate
+        startDate: this.screenForm.startDate,
+        remark: this.screenForm.remark
       }
       getProductPriceList(params).then((res) => {
         this.dataList = res.data.records

src/views/basic_data/warehouse/warehouse_book.vue

@@ -160,15 +160,15 @@ export default {
         correspondId: [
           { required: true, message: '请选择仓库', trigger: 'change' }
         ],
-        categoryId: [
-          { required: true, message: '请选择存货', trigger: 'change' }
-        ],
+        // categoryId: [
+        //   { required: true, message: '请选择存货', trigger: 'change' }
+        // ],
         number: [
           { required: true, message: '请输入最大预约单量', trigger: 'blur' }
         ],
-        towerNum: [
-          { required: true, message: '请输入预约台数量', trigger: 'blur' }
-        ]
+        // towerNum: [
+        //   { required: true, message: '请输入预约台数量', trigger: 'blur' }
+        // ]
       },
       type: '',
       editData: {

src/views/engin_deposit/components/deposit-apply-deduction.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
-          <div class="label">工程登录编码</div>
+          <div class="label">工程登录编号</div>
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
@@ -218,4 +218,4 @@ export default {
 .dateStyle {
   width: 100%;
 }
-</style>
+</style>

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -10,11 +10,11 @@
       <el-form ref="form" :model="details">
         <el-row :gutter="0">
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程登录编码</div>
+            <div class="label">工程登录编号</div>
             <div class="value">{{ details.refEnginRecordNo }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程名称(项目名称)</div>
+            <div class="label">项目类型</div>
             <div class="value">{{ details.refProjectName }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">
@@ -473,7 +473,7 @@ export default {
         downloadPdf(this.$imageUrl + v, fileName)
         return
       }
-        downloadFiles("/common/file/getStream", { key: v, fileName});
+        downloadFiles("/common/file/getStream", { key: v, fileName:fileName});
       // getFileUrl({ key: v }).then((res) => {
       //   window.open(res.data)
       // })

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -17,11 +17,11 @@
         <el-form ref="form" :model="details">
           <el-row :gutter="0">
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">工程登录编码</div>
+              <div class="label">工程登录编号</div>
               <div class="value">{{ details.refEnginRecordNo }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">工程名称(项目名称)</div>
+              <div class="label">项目类型</div>
               <div class="value">{{ details.refProjectName }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
@@ -804,9 +804,10 @@ export default {
         downloadPdf(this.$imageUrl + v, fileName)
         return
       }
-      getFileUrl({ key: v }).then((res) => {
-        window.open(res.data)
-      })
+          downloadFiles("/common/file/getStream", { key: v, fileName:fileName});
+      // getFileUrl({ key: v }).then((res) => {
+      //   window.open(res.data)
+      // })
     },
     openPdf(pdfUrl) {
       window.open(this.$imageUrl + pdfUrl)

src/views/engin_deposit/deposit_list.vue

@@ -17,7 +17,7 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编码" prop="refEnginRecordNo">
+              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
                 <el-input
                   v-model="screenForm.refEnginRecordNo"
                   placeholder="请输入"
@@ -121,7 +121,7 @@
             <el-table-column align="left" type="selection" width="55" />
             <el-table-column
               align="left"
-              label="工程登录编码"
+              label="工程登录编号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

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

@@ -203,7 +203,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.price * scope.row.qty }}
+            {{ scope.row.price * scope.row.qty | numToFixed }}
           </template>
         </el-table-column>
         <el-table-column
@@ -251,7 +251,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.qty * scope.row.discAmount }}
+            {{ scope.row.qty * scope.row.discAmount  | numToFixed}}
           </template>
         </el-table-column>
 
@@ -330,7 +330,7 @@
               {{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100) | numToFixed }}
             </template>
             <template v-else>
-              {{ (scope.row.price*scope.row.qty ).toFixed(2) }}
+              {{ (scope.row.price*scope.row.qty ) | numToFixed }}
             </template>
           </template>
         </el-table-column>
@@ -563,7 +563,7 @@
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.qty * scope.row.price || 0 }}
+                    {{ scope.row.qty * scope.row.price || 0 | numToFixed }}
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -674,7 +674,7 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  {{ scope.row.qty * scope.row.price || 0 }}
+                  {{ scope.row.qty * scope.row.price || 0  | numToFixed}}
                 </template>
               </el-table-column>
               <el-table-column