12-1 bug

src/components/Common/image-upload.vue

@@ -5,7 +5,6 @@
       :action="oss_url"
       :data="dataObj"
       :multiple="multiple"
-      :limit="limit"
       name="file"
       :accept="accept"
       :show-file-list="false"
@@ -39,9 +38,17 @@
           </div>
         </div>
       </div>
-      <div v-if="multiple|| (!multiple && fileList.length < 1) " class="add" @click="uploadImage()">
-        <i class="el-icon-plus" />
+      <div v-if="limit">
+        <div v-if="limit !==fileList.length" class="add" @click="uploadImage()">
+          <i class="el-icon-plus" />
+        </div>
+      </div>
+      <div v-else>
+        <div v-if="multiple  || (!multiple && fileList.length < 1) " class="add" @click="uploadImage()">
+          <i class="el-icon-plus" />
+        </div>
       </div>
+
     </div>
   </div>
 </template>
@@ -198,8 +205,10 @@ export default {
 
     // 删除图片
     deleteImage(url) {
+
       const index = findElem(this.fileList, 'url', url)
       this.fileList.splice(index, 1)
+      console.log(this.fileList)
     },
 
     // 点击上传
@@ -210,6 +219,7 @@ export default {
 
     // 上传文件之前
     async beforeUpload(file) {
+
       const loading = this.$loading({
         lock: true,
         text: 'Loading',

src/views/deposit_commerce/deposit_list.vue

@@ -232,6 +232,22 @@
                       />
                     </el-form-item>
                   </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="结算日期 " prop="settlementStatus">
+                      <el-select style="width: 100%" v-model="screenForm.settlementStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="寄厂日期 " prop="mailFactoryStatus">
+                      <el-select style="width: 100%" v-model="screenForm.mailFactoryStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                 </template>
               </el-row>
             </el-form>
@@ -441,6 +457,8 @@ export default {
         refFactoryNo: '',
         factoryNo: '',
         specialNo: '',
+        mailFactoryStatus:''  ,
+        settlementStatus:'',
         refRegionWork: '',
         endSubmitTime: '',
         startAcceptTime: '',

src/views/deposit_commerce/refund_list.vue

@@ -230,6 +230,22 @@
                       />
                     </el-form-item>
                   </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="结算日期 " prop="settlementStatus">
+                      <el-select style="width: 100%" v-model="screenForm.settlementStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="寄厂日期 " prop="mailFactoryStatus">
+                      <el-select style="width: 100%" v-model="screenForm.mailFactoryStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <!-- <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="产品编码" >
                       <div class="fanwei">
@@ -548,6 +564,8 @@ export default {
         specification: '',
         refFactoryNo: '',
         factoryNo: '',
+        mailFactoryStatus:''  ,
+        settlementStatus:'',
         specialNo: '',
         refRegionWork: '',
         endSubmitTime: '',

src/views/deposit_home/deposit_list.vue

@@ -380,6 +380,23 @@
                       <el-input v-model="screenForm.inFactoryType" placeholder="请输入入厂类型" />
                     </el-form-item>
                   </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="结算日期 " prop="settlementStatus">
+                      <el-select style="width: 100%" v-model="screenForm.settlementStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="寄厂日期 " prop="mailFactoryStatus">
+                      <el-select style="width: 100%" v-model="screenForm.mailFactoryStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
                 </template>
               </el-row>
             </el-form>
@@ -845,7 +862,8 @@ export default {
           value: false
         }
       ],
-
+      mailFactoryStatus:''  ,
+      settlementStatus:'',
       examineStatusArr: [
         {
           label: '保存',

src/views/deposit_home/refund_list.vue

@@ -222,6 +222,22 @@
                       />
                     </el-form-item>
                   </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="结算日期 " prop="settlementStatus">
+                      <el-select style="width: 100%"  v-model="screenForm.settlementStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="寄厂日期 " prop="mailFactoryStatus">
+                      <el-select style="width: 100%" v-model="screenForm.mailFactoryStatus" clearable placeholder="请选择">
+                        <el-option label="为空" :value="1"></el-option>
+                        <el-option label="不为空" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <!-- <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="产品编码" >
                       <div class="fanwei">
@@ -620,6 +636,8 @@ export default {
       showSurrender: true,
       detailId: '',
       selectData: [],
+      mailFactoryStatus:''  ,
+      settlementStatus:'',
       isShowExamineDialog: false,
       examineForm: {
         status: 'OK',

src/views/finance/change_apply.vue

@@ -61,8 +61,39 @@
           <el-table-column label="序号" type="index" align="left" width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div v-if="scope.$index == 0">{{ searchForm.customerNumber }}</div>
-              <div v-if="scope.$index == 1">{{ scope.row.customerNumber }}</div>
+              <div v-if="scope.$index == 0">
+                <div v-if="isCustomer">{{ searchForm.customerNumber }}</div>
+              <div v-else>
+                <el-select
+                  size="mini"
+                  class="dateStyle"
+                  @change="changeCustomerNumber($event,0)"
+                  filterable
+                  v-model="scope.row.customerNumber"
+                  placeholder="请选择"
+                >
+                  <el-option v-for="item in customerData" :key="item.id" :label="item.number" :value="item.number"> </el-option>
+                </el-select>
+
+              </div>
+              </div>
+              <div v-if="scope.$index == 1">
+                <div v-if="isCustomer">{{ scope.row.customerNumber }}</div>
+                <div v-else>
+                  <el-select
+                    size="mini"
+                    class="dateStyle"
+                    @change="changeCustomerNumber($event,1)"
+
+                    filterable
+                    v-model="scope.row.customerNumber"
+                    placeholder="请选择"
+                  >
+                    <el-option v-for="item in customerData" :key="item.id" :label="item.number" :value="item.number"> </el-option>
+                  </el-select>
+
+                </div>
+                </div>
             </template>
           </el-table-column>
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
@@ -174,7 +205,7 @@ export default {
         customerNumber: ''
       },
       customerData: [], //经销商数据
-      typeList: [] //返利类型数据
+      typeList: [], //返利类型数据
       // rules: {
       //   theTime: [
       //     {
@@ -184,6 +215,7 @@ export default {
       //     },
       //   ],
       // },
+      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer
     }
   },
   computed: {
@@ -225,7 +257,9 @@ export default {
     //   }
     //   return null;
     // },
-
+    changeCustomerNumber(e,index){
+      this.$set(this.dataList[index],'customerNumber',e)
+    },
     resetFn() {
       this.searchForm.theTime = null
       this.dataList.forEach(v => {

src/views/supply/apply/apply_list.vue

@@ -143,6 +143,14 @@
                     <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单状态" prop="automaticStatus">
+                    <el-select v-model="screenForm.automaticStatus" clearable placeholder="请选择">
+                      <el-option label="非计划单" :value="true"></el-option>
+                      <el-option label="计划单" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :xs="24" :sm="12" :lg="6"></el-col>
               </el-row>
             </el-form>
@@ -548,7 +556,8 @@ export default {
         serviceId: '',
         categoryId: '',
         approvalName: '',
-        createBy: ''
+        createBy: '',
+        automaticStatus:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -599,7 +608,8 @@ export default {
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
         categoryId: this.screenForm.categoryId,
-        approvalName: this.screenForm.approvalName
+        approvalName: this.screenForm.approvalName,
+        automaticStatus:this.screenForm.automaticStatus
       }
     }
   },
@@ -664,6 +674,7 @@ export default {
         correspondName: this.screenForm.warehouse,
         customerNumber: this.screenForm.jxsNum,
         createBy: this.screenForm.createBy,
+        automaticStatus:this.screenForm.automaticStatus,
 
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,

src/views/supply/apply/engin_list.vue

@@ -156,6 +156,15 @@
                     <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="订单状态" prop="automaticStatus">
+                    <el-select v-model="screenForm.automaticStatus" clearable placeholder="请选择">
+                      <el-option label="非计划单" :value="true"></el-option>
+                      <el-option label="计划单" :value="false"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
               </el-row>
             </el-form>
           </template>
@@ -619,6 +628,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
+        automaticStatus:this.screenForm.automaticStatus,
         k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
@@ -691,6 +701,7 @@ export default {
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
+        automaticStatus:this.screenForm.automaticStatus,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',

src/views/supply/engin/engin_list.vue

@@ -9,7 +9,7 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-radio-group size="mini" v-model="screenForm.status" @change="getList(),screenForm.examineStatus=''">
+            <el-radio-group size="mini" v-model="screenForm.status" @change="screenForm.examineStatus='',getList()">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                   item.label
@@ -652,8 +652,8 @@ export default {
     getList() {
       this.listLoading = true
       let  status = ''
-      if (this.screenForm.examineStatus){
-        if (this.screenForm.status!='OK'){
+      if (this.screenForm.examineStatus ){
+        if (this.screenForm.status!='OK' && this.screenForm.status){
           status += this.screenForm.status+ ',' +this.screenForm.examineStatus
         }else {
           status = this.screenForm.examineStatus

src/views/supply/implement/implement_list.vue

@@ -347,6 +347,25 @@
             </el-table-column>
             <el-table-column
               align="right"
+              label="格力折扣"
+              prop="totalDiscAmount"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="right"
+              label="原供价"
+              prop="orgPrice"
+              min-width="100"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.orgPrice | numToFixed }}
+
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
               label="出库数量"
               prop="hasSendQty"
               min-width="100"