Finish Hotfix-zh-255

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

@@ -196,74 +196,150 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column align="left" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.factoryNo" />
-              <span>{{scope.row.factoryNo}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specialNo" />
-              <span>{{scope.row.specialNo}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialNumber" />
-              <span>{{scope.row.materialNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="400" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.price | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="数量" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column align="right" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.totalAmount | numToFixed }}
+          <el-table
+            v-loading="listLoading"
+            :data="detailList.items"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+
+
+              <template v-if="!isCustomer">
+
+                     <el-table-column
+              align="left"
+              label="厂编号"
+              prop="factoryNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.factoryNo" />
+                <span>{{scope.row.factoryNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
+              </template>
+
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="单价"
+              prop="price"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
             </template>
-          </el-table-column> -->
-          <!-- <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
-          </el-table-column>
-          <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus == 'WAIT'">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.dataQty"></el-input>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="数量"
+              prop="qty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="金额"
+              prop="totalAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed}}
             </template>
-          </el-table-column> -->
-          <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
-            <template slot-scope="scope">
-              {{ scope.row.diffAmount | numToFixed }}
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="hasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="押金金额"
+              prop="depositAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed}}
             </template>
-          </el-table-column>
-          <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus == 'WAIT'">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.diffAmount"></el-input>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="上交资料"
+              prop="dataQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="收差全额"
+              prop="diffAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed}}
             </template>
-          </el-table-column>
-        </el-table>
-      </div>
+            </el-table-column>
+          </el-table>
+        </div>
     </div>
 
     <h3 class="gdzl">工程资料</h3>

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

@@ -196,73 +196,151 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
-          <el-table-column v-if="!isCustomer" align="left" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>\
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.factoryNo" />
-              <span>{{scope.row.factoryNo}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="!isCustomer" align="left" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specialNo" />
-              <span>{{scope.row.specialNo}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialNumber" />
-              <span>{{scope.row.materialNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="400" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.price | numToFixed }}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="数量" prop="qty" min-width="160" show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column align="right" label="金额" prop="totalAmount" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.totalAmount | numToFixed }}
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="detailList.items"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries"
+          >
+
+
+              <template v-if="!isCustomer">
+
+                     <el-table-column
+              align="left"
+              label="厂编号"
+              prop="factoryNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.factoryNo" />
+                <span>{{scope.row.factoryNo}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
+              </template>
+
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="单价"
+              prop="price"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.price | numToFixed}}
             </template>
-          </el-table-column>
-          <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
-          </el-table-column>
-          <el-table-column align="right" label="上传资料" prop="dataQty" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus == 'WAIT'">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.dataQty"></el-input>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="数量"
+              prop="qty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="金额"
+              prop="totalAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed}}
             </template>
-          </el-table-column> -->
-          <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus !== 'WAIT'">
-            <template slot-scope="scope">
-              {{ scope.row.diffAmount | numToFixed }}
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="hasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="押金金额"
+              prop="depositAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed}}
             </template>
-          </el-table-column>
-          <el-table-column align="right" label="收差金额" prop="diffAmount" min-width="160" show-overflow-tooltip v-if="detailList.examineStatus == 'WAIT'">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.diffAmount"></el-input>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="上交资料"
+              prop="dataQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="收差全额"
+              prop="diffAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
+             <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed}}
             </template>
-          </el-table-column>
-        </el-table>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
     </div>
 

src/views/supply/engin/commerce_list.vue

@@ -84,8 +84,20 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否直调" prop="isDirectTransfer">
+                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直"   style="width: 100%">
+                  <el-option :value="null" label="默认"></el-option>
+                  <el-option
+                    v-for="item in transfer"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -356,6 +368,7 @@ export default {
         salesMan: '',
         dealer: '',
         model: '',
+        isDirectTransfer:null
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -368,7 +381,10 @@ export default {
       salesTypeList: [],
 
       multipleSelection: [],
-
+      transfer:[
+        {label:'是',value:true},
+        {label:'否',value:false}
+      ],
       queryItem: {},
       isShowDetail: false,
       isShowForm: false,
@@ -402,6 +418,8 @@ export default {
         serviceId: this.screenForm.salesMan,
         customerKeyWord: this.screenForm.dealer,
         specification: this.screenForm.model,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       }
     },
@@ -459,6 +477,8 @@ export default {
         confirmName: this.screenForm.examineMan,
         serviceId: this.screenForm.salesMan,
         customerKeyword: this.screenForm.dealer,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
         specification: this.screenForm.model,
         enginOrderType: 'TRADE', // TRADE=商用 HOME=家用
       };

src/views/supply/engin/engin_list.vue

@@ -82,8 +82,20 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否直调" prop="isDirectTransfer">
+                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直"   style="width: 100%">
+                  <el-option :value="null" label="默认"></el-option>
+                  <el-option
+                    v-for="item in transfer"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -315,7 +327,9 @@ export default {
         status: [],
         salesMan: '',
         model: '',
-        orderDate: ''
+        orderDate: '',
+        isDirectTransfer:null
+
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -325,7 +339,10 @@ export default {
         { label: '已关闭', value: 'CLOSE' },
       ],
       salesmanList: [],
-
+      transfer:[
+        {label:'是',value:true},
+        {label:'否',value:false}
+      ],
       queryItem: {},
       isShowDetail: false,
       isShowForm: false,
@@ -360,6 +377,8 @@ export default {
         examineStatus: this.screenForm.status.join(','),
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
       }
     },
   },
@@ -422,6 +441,8 @@ export default {
         examineStatus: this.screenForm.status.join(','),
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

src/views/supply/engin/home_list.vue

@@ -128,7 +128,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 6 : 24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="是否直调" prop="isDirectTransfer">
+                <el-select v-model="screenForm.isDirectTransfer" placeholder="选择是否直"   style="width: 100%">
+                  <el-option :value="null" label="默认"></el-option>
+                  <el-option
+                    v-for="item in transfer"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="!isCustomer ? 12 : 24" :lg="!isCustomer ? 24 : 24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -433,7 +446,9 @@ export default {
         geLiInerNote: '',
         refFactoryNo: '',
         refBuyUnitName: '',
-        refPromiseProvide: ''
+        refPromiseProvide: '',
+        isDirectTransfer:null
+
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -443,7 +458,10 @@ export default {
         { label: '已关闭', value: 'CLOSE' },
       ],
       salesmanList: [],
-
+      transfer:[
+        {label:'是',value:true},
+        {label:'否',value:false}
+      ],
       multipleSelection: [],
 
       queryItem: {},
@@ -488,6 +506,8 @@ export default {
         refFactoryNo: this.screenForm.refFactoryNo,
         refBuyUnitName: this.screenForm.refBuyUnitName,
         refPromiseProvide: this.screenForm.refPromiseProvide,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       }
     },
@@ -555,6 +575,8 @@ export default {
         geLiInerNote: this.screenForm.geLiInerNote,
         refFactoryNo: this.screenForm.refFactoryNo,
         refBuyUnitName: this.screenForm.refBuyUnitName,
+        isDirectTransfer:this.screenForm.isDirectTransfer,
+
         refPromiseProvide: this.screenForm.refPromiseProvide,
         enginOrderType: 'HOME', // TRADE=商用 HOME=家用
       };

src/views/supply/policy/policy_list.vue

@@ -301,7 +301,7 @@
 
             </el-table-column>
 
-            
+
             <el-table-column
               align="left"
               label="产品名称"