【修改】bug

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

@@ -322,6 +322,18 @@
             </el-table-column>
             <el-table-column
               align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+            </template>
+
+            </el-table-column>
+            <el-table-column
+              align="right"
               label="上交资料"
               prop="dataQty"
               min-width="160"
@@ -757,6 +769,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+    .inpt{
+    ::v-deep .el-input__inner{
+      text-align: right ;
+
+    }
+}
 .aaa {
   height: 64px;
   width: 64px;

src/views/deposit_commerce/deposit_list.vue

@@ -205,10 +205,26 @@
                 </el-form-item>
 
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="厂编号" prop="factoryNo">
                   <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
                 </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -569,7 +585,9 @@ export default {
         endSubmitTime:''
         ,
         startAcceptTime:'',    endAcceptTime:'',
-        geLiInerNote:'',factoryNo:''
+        geLiInerNote:'',factoryNo:'',
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_commerce/refund_list.vue

@@ -143,11 +143,26 @@
                   <el-input v-model="screenForm.geLiInerNote"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
                   <el-input v-model="screenForm.factoryNo"></el-input>
                 </el-form-item>
 
+              </el-col> -->     <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -417,6 +432,8 @@ export default {
         startAcceptTime: "",
         endAcceptTime: "",
         geLiInerNote: "",
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       refundDepositArr: [
         {

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

@@ -164,8 +164,8 @@
             min-width="160"
             show-overflow-tooltip
           />
-          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
           <el-table-column
             align="center"

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

@@ -221,8 +221,8 @@
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="right"

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

@@ -327,6 +327,19 @@
              <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
             </template>
+
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+            </template>
+
             </el-table-column>
 <!--            <el-table-column-->
 <!--              align="right"-->
@@ -746,7 +759,7 @@ export default {
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
-        item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount'];
+        item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount','contractPrice'];
       });
       res.data.items = arr
       this.detailList = res.data;
@@ -766,6 +779,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .inpt{
+    ::v-deep .el-input__inner{
+      text-align: right ;
+
+    }
+}
 .aaa {
   height: 64px;
   width: 64px;
@@ -791,4 +810,5 @@ export default {
 .selectStyle {
   width: 100%;
 }
+
 </style>

src/views/deposit_home/deposit_list.vue

@@ -196,10 +196,26 @@
                   <el-input v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
+              <!-- <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
                 <el-form-item label="厂编号" prop="factoryNo">
                   <el-input v-model="screenForm.factoryNo" placeholder="请输入厂编号"></el-input>
                 </el-form-item>
+              </el-col> -->
+              <el-col :xs="24" :sm="12" :lg="6" v-if="!isCustomer">
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
+
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -600,6 +616,8 @@ export default {
         startAcceptTime: '',
         endAcceptTime: '',
         geLiInerNote: '',
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_home/refund_list.vue

@@ -136,11 +136,21 @@
                   <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="厂编号" prop="factoryNo">
-                  <el-input v-model="screenForm.factoryNo" placeholder="厂编号"></el-input>
-                </el-form-item>
+              <el-col :xs="24" :sm="12" :lg="6" >
+                <el-form-item label="厂编号" style="margin-bottom:0">
+                  <div class="fanwei">
+                     <el-form-item prop="startFactoryNo">
+                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endFactoryNo">
 
+                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
@@ -428,6 +438,8 @@ export default {
         startAcceptTime: "",
         endAcceptTime: "",
         geLiInerNote: "",
+        startFactoryNo:'',
+        endFactoryNo:''
       }, // 搜索表单
       refundDepositArr: [
         {

src/views/supply/engin/components/home_detail.vue

@@ -189,8 +189,8 @@
             <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="350" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" 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="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>

src/views/supply/engin/components/home_examine.vue

@@ -220,8 +220,8 @@
         <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="350" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/supply/engin/components/home_form.vue

@@ -217,7 +217,7 @@
             <div v-else>{{scope.row.specification}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.realMaterialNumber" size="small" readonly @click.native="getRealMaterData(scope.$index)" ></el-input>
           </template>

src/views/supply/engin/components/home_return.vue

@@ -166,8 +166,8 @@
         <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="350" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="实装物料编号" prop="realMaterialNumber" min-width="150" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="实装厂产品编码" prop="realMaterialOldNumber" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="实装规格型号" prop="realSpecification" min-width="300" 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="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>