BUG修复

src/views/material/back/component/home.vue

@@ -78,7 +78,7 @@
                     ></el-option>
                 </el-select> -->
             </el-form-item>
-            <el-form-item label="工程名称" prop="proId">
+            <el-form-item label="退料工程" prop="proId">
                 <el-cascader v-model="projectId"
                         :show-all-levels="false"
                         :options="proList"

src/views/material/basic/bmProject/index.vue

@@ -47,25 +47,25 @@
                     >新建</el-button
                 >
             </el-col>
+<!--            <el-col :span="1.5">-->
+<!--                <el-button-->
+<!--                    type="warning"-->
+<!--                    plain-->
+<!--                    icon="el-icon-download"-->
+<!--                    size="mini"-->
+<!--                    @click="handleExport"-->
+<!--                    >导入数据</el-button-->
+<!--                >-->
+<!--            </el-col>-->
             <el-col :span="1.5">
                 <el-button
                     type="warning"
                     plain
                     icon="el-icon-download"
                     size="mini"
-                    @click="handleExport"
+                    @click="handleExport">
-                    >导入数据</el-button
+                  导出数据
-                >
+                </el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    >导出数据</el-button
-                >
             </el-col>
 
             <right-toolbar
@@ -139,10 +139,16 @@
                 prop="telphone"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="i8工程编号"
+                align="center"
+                prop="externalId"
+                :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="工程状态"
                 align="center"
-                prop="proStatus"
+                prop="proStatusName"
                 :show-overflow-tooltip="true"
             >
             </el-table-column>
@@ -488,7 +494,6 @@ export default {
         this.getProjectType()
     },
     methods: {
-
         async getProjectType(){
            let prodataRes =  await queryProDataApi('bm_project_type');
             this.proDataRange = prodataRes.data.map((item) => {

src/views/material/ma/partType/index.vue

@@ -79,9 +79,9 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="关键字" prop="keyword">
+          <el-form-item label="关键字" prop="keyWord">
             <el-input
-              v-model="queryParams.keyword"
+              v-model="queryParams.keyWord"
               placeholder="请输入关键字"
               clearable
               style="width: 240px"
@@ -568,7 +568,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.keyWord = null;
+      this.keyWord = null;
       this.handleQuery();
     },
 

src/views/material/ma/supplier/index.vue

@@ -696,9 +696,9 @@
         },
 
         handleExport() {
-            this.download('/material/wh_house_info/export', {
+            this.download('/material/ma_supplier_info/export', {
               ...this.queryParams
-            }, `仓库管理_${new Date().getTime()}.xlsx`)
+            }, `物资厂家管理_${new Date().getTime()}.xlsx`)
         },
 
       /** 搜索按钮操作 */

src/views/material/ma/type/index.vue

@@ -398,6 +398,7 @@
                 v-model="form.name3"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 170px"
               />
             </el-form-item>
@@ -408,6 +409,7 @@
                 v-model="form.name2"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 170px"
               />
             </el-form-item>
@@ -422,6 +424,7 @@
                 v-model="form.name1"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 160px"
               />
             </el-form-item>
@@ -435,6 +438,7 @@
               <el-input
                 v-model="form.name10"
                 placeholder="请输入"
+                type="number"
                 maxlength="20"
                 style="width: 160px"
               />
@@ -474,6 +478,7 @@
             <el-form-item label="检验周期" prop="testCycle">
               <el-input
                 v-model="form.testCycle"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 150px"
@@ -485,6 +490,7 @@
             <el-form-item label="抽检比例(%)" prop="name11">
               <el-input
                 v-model="form.name11"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 170px"
@@ -526,6 +532,7 @@
             <el-form-item label="持荷时间(分)" prop="holdingTime">
               <el-input
                 v-model="form.holdingTime"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 170px"