Finish Hotfix-zh-154

src/views/deposit_commerce/deposit_list.vue

@@ -11,7 +11,7 @@
         <el-form
           ref="screenForm"
           :model="screenForm"
-          label-width="120px"
+          label-width="140px"
           size="mini"
           label-position="left"
         >
@@ -197,7 +197,41 @@
                 </el-form-item>
 
               </el-col>
+  <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="格力内部备注" prop="geLiInerNote">
 
+                        <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>
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.startAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.endAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
 
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
@@ -507,6 +541,9 @@ export default {
         specialNo:'',
         refRegionWork:'',
         endSubmitTime:''
+        ,
+        startAcceptTime:'',    endAcceptTime:'',
+        geLiInerNote:'',factoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/deposit_home/deposit_list.vue

@@ -11,7 +11,7 @@
         <el-form
           ref="screenForm"
           :model="screenForm"
-          label-width="120px"
+          label-width="140px"
           size="mini"
           label-position="left"
         >
@@ -110,7 +110,7 @@
               </el-select>
               </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="examineStatus">
               <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable placeholder="请选择状态 " >
 
@@ -198,7 +198,43 @@
                 </el-form-item>
 
               </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="格力内部备注" prop="geLiInerNote">
+
+                        <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>
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.startAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.endAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
 
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
@@ -507,7 +543,9 @@ export default {
         factoryNo:'',
         specialNo:'',
         refRegionWork:'',
-        endSubmitTime:''
+        endSubmitTime:'',
+        startAcceptTime:'',    endAcceptTime:'',
+        geLiInerNote:'',factoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

src/views/supply/retail/components/retail_form.vue

@@ -95,11 +95,11 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+        <!-- <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
                <el-input v-model="scope.row.fileNo" size="small" ></el-input>
           </template>
-           </el-table-column>
+           </el-table-column> -->
       <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>