Merge tag 'Hotfix-zh-113' into develop

Finish Hotfix-zh-113

src/components/Common/image-upload.vue

@@ -255,7 +255,9 @@ export default {
         if (!filterKeywords.length || suffix.includes('zip', 'rar', 'gz', 'apk')) {
           this.fileName = `其他文件${suffix}`
         }
+        // if(filterKeywords.length ){
 
+        // }
       }
     }
   }

src/views/basic_data/material/modify_list.vue

@@ -77,17 +77,17 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品类别" prop="categoryId">
+                <el-form-item label="产品类别" prop="k3CategoryNumber">
                   <el-select
                   style="width:100%"
                     placeholder="请选择产品类别"
-                    v-model="screenForm.mainId"
+                    v-model="screenForm.k3CategoryNumber"
                   >
                     <el-option label="全部" value=""></el-option>
                     <el-option
                       v-for="item in dictList"
-                      :label="item.dictValue"
-                      :value="item.dictCode"
+                      :label="item.name"
+                      :value="item.number"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -495,7 +495,7 @@ import {
   getTypeList
 } from '@/api/basic_data/material'
 import { downloadFiles } from '@/utils/util'
-import { getDictList } from '@/api/common'
+import { getCategoryList } from '@/api/common'
 
 export default {
   mixins: [Mixin],
@@ -533,7 +533,7 @@ export default {
         startDate: "",
         materialOldNumber:'',
         saleTypeId:'',
-        mainId:'',
+        k3CategoryNumber:'',
         specification:''
       },
       liDetail: {},
@@ -588,10 +588,10 @@ export default {
     getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });
-    getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
-      this.dictList = res.data;
-      console.log(this.dictList)
-    });
+   getCategoryList({ pageNum:1,pageSize:-1}).then((res) => {
+      this.dictList = res.data.records
+      console.log(this.dictList,777777)
+    })
   },
   methods: {
     formatterType(row) {
@@ -645,7 +645,7 @@ export default {
         startDate: this.screenForm.startDate,
         materialOldNumber:this.screenForm.materialOldNumber,
         saleTypeId:this.screenForm.saleTypeId,
-        mainId:this.screenForm.mainId,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber,
         specification:this.screenForm.specification
       };
       getProductRriceList(params).then((res) => {

src/views/basic_data/material/price_list.vue

@@ -75,16 +75,16 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品类别" prop="categoryId">
+            <el-form-item label="产品类别" prop="k3CategoryNumber">
               <el-select
-                v-model="screenForm.mainId"
+                v-model="screenForm.k3CategoryNumber"
                 placeholder="请选择产品类别"
               >
                 <el-option label="全部" value="" />
                 <el-option
                   v-for="item in dictList"
-                  :label="item.dictValue"
-                  :value="item.dictCode"
+                  :label="item.name"
+                  :value="item.number"
                 />
               </el-select>
             </el-form-item>
@@ -394,7 +394,7 @@
 <script>
 import Mixin from '@/mixin/index'
 import { getProductDelete, getProductPriceList, getTypeList, handlePriceRevoke } from '@/api/basic_data/material'
-import { getDictList } from '@/api/common'
+import { getCategoryList } from '@/api/common'
 
 export default {
   mixins: [Mixin],
@@ -405,7 +405,7 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [],
       screenForm: {
-        mainId: '',
+        k3CategoryNumber: '',
         endDate: '',
         materialName: '',
         materialNumber: '',
@@ -420,9 +420,9 @@ export default {
     }
   },
   mounted() {
-    getDictList({ sysDictEnum: 'PRODUCT_TYPE' }).then((res) => {
-      this.dictList = res.data
-      console.log(this.dictList)
+    getCategoryList({ pageNum:1,pageSize:-1}).then((res) => {
+      this.dictList = res.data.records
+      console.log(this.dictList,777777)
     })
   },
   methods: {
@@ -443,7 +443,7 @@ export default {
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        mainId: this.screenForm.mainId,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
         endDate: this.screenForm.endDate,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,

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

@@ -421,7 +421,7 @@ export default {
       fileList: [],
       details: {},
       restrictFilename: [
-        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片'
+        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片','相片'
       ]
     }
   },

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

@@ -915,22 +915,23 @@ export default {
           pageNum: 1,
           type:3,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus: 'OK'
+
         }).then((res) => {
           this.goodsList = res.data.records
         })
       } else {
 
-      getList({
+      getListProject({
           pageSize: -1,
           pageNum: 1,
-         orderType   :'TRADE',
-          enginRecordNo: this.$parent.refEnginRecordNo
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+
         }).then((res) => {
-          this.projectList = res.data.records
+          this.projectList= res.data.records
         })
 
 
+
       }
     },
     // 批量下载

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

@@ -422,7 +422,7 @@ export default {
       fileList: [],
       details: {},
       restrictFilename: [
-        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片'
+        '结算单', '合同', '明细表', '审核表', '收据', '发票', '照片','相片'
       ]
     }
   },

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

@@ -915,7 +915,7 @@ export default {
           pageNum: 1,
           type:3,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus: 'OK'
+
         }).then((res) => {
           this.goodsList = res.data.records
         })
@@ -925,7 +925,7 @@ export default {
           pageSize: -1,
           pageNum: 1,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus: 'OK'
+
         }).then((res) => {
           this.projectList= res.data.records
         })

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

@@ -130,7 +130,7 @@
         <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.approvalNumber" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
@@ -281,10 +281,10 @@ export default {
     // 提交审批
     clickSubmitForm(val) {
       for(let i=0; i<this.goodsList.length; i++) {
-        if(this.goodsList[i].approvalNumber === '') {
-          this.$errorMsg('请填写审批数量');
-          return;
-        }
+        // if(this.goodsList[i].approvalNumber === '') {
+        //   this.$errorMsg('请填写审批数量');
+        //   return;
+        // }
         // if(this.goodsList[i].approvalNumber > this.goodsList[i].refundableQty) {
         //   this.$errorMsg('审批数量不可大于申请数量');
         //   return;