【修改】bug

src/components/Common/check-order.vue

@@ -31,8 +31,8 @@
         <el-table-column align="center" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" 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="right" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip>
@@ -113,4 +113,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-</style>
+</style>

src/views/deposit_commerce/deposit_list.vue

@@ -556,10 +556,6 @@ export default {
           value: "OK",
         },
         {
-          label: "不通过",
-          value: "FAIL",
-        },
-        {
           label: "关闭",
           value: "CLOSE",
         },

src/views/deposit_commerce/refund_list.vue

@@ -186,10 +186,10 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
+                <CopyButton :copyText="scope.row.refTradeCategory" />
+                <span>{{scope.row.refTradeCategory}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位

src/views/deposit_home/deposit_list.vue

@@ -534,10 +534,6 @@ export default {
           value:'OK'
         },
         {
-          label:'不通过',
-          value:'FAIL'
-        },
-        {
           label:'关闭',
           value:'CLOSE'
         },

src/views/deposit_home/refund_list.vue

@@ -191,10 +191,10 @@
             </el-table-column>
               <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
+                <CopyButton :copyText="scope.row.refTradeCategory" />
+                <span>{{scope.row.refTradeCategory}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位

src/views/sales_policy/components/AddCondition.vue

@@ -624,7 +624,7 @@ export default {
       for (let i = 0; i < this.conditionBox.length; i++) {
         for (let j = 0; j < this.conditionBox[i].length; j++) {
           this.conditionBox[i][j].popType = i + 1;
-          this.conditionBox[i][j].policyId = this.comCode;
+          this.conditionBox[i][j].policyId = this.$parent.searchForm.code || this.comCode;
           this.conditionBox[i][j].id = "";
           //  this.conditionBox[i][j].policyMaterialId =this.conditionBox[i][j].materialId
         }

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

@@ -95,7 +95,7 @@
         <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>
           <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="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -143,7 +143,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
@@ -304,4 +304,4 @@ export default {
   ::v-deep input[type='number'] {
     -moz-appearance: textfield;
   }
-</style>
+</style>

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

@@ -126,7 +126,13 @@
         <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <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="160" 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="price" min-width="100" show-overflow-tooltip>
+                  <template slot-scope="scope">
+              {{scope.row.price | numToFixed}}
+            </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="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">

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

@@ -50,8 +50,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类别" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" :disabled="isDealer"></el-input>
+          <el-form-item label="家用项目类别" prop="enginName">
+            <el-input v-model="mainForm.enginName" placeholder="请输入家用项目类别" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -187,8 +187,8 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="enginName" label="项目类别">
-              <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+            <el-form-item prop="enginName" label="家用项目类别">
+              <el-input v-model="screenForm.enginName" placeholder="请输入家用项目类别"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">

src/views/supply/pickup/components/pickup_form.vue

@@ -3,7 +3,7 @@
 
     <el-page-header @back="goBack" :content="listItem ? '编辑':'新增'"></el-page-header>
     <el-divider></el-divider>
-    
+
     <div>
       <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="80px" size="small" label-position="left">
         <el-row :gutter="20">
@@ -97,7 +97,7 @@
           </el-table-column>
           <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
           <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="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
@@ -321,7 +321,7 @@ export default {
               this.submitForm();
             }
           })
-          
+
         }
       })
     },