代码提交

src/HDrpManagement/afterSalesmag/index.vue

@@ -16,7 +16,7 @@
       }"
       @listData="list"
       @listCreate="listCreate">
-      <div slot="custom" style="display:flex">
+      <template #custom>
         <!-- <div class="label_center">
           <p class="search__label">类型:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = '';$refs.list.listData()" v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择类型" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = type;$refs.list.listData()">
@@ -24,7 +24,7 @@
             <el-option label="借用归还单" value="借用归还单" />
           </el-select>
         </div> -->
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
             <el-option label="新建" value="新建" />
@@ -33,7 +33,22 @@
             <el-option label="复核" value="复核" />
           </el-select>
         </div>
-      </div>
+        <div class="mt-10">
+          <label class="search__label" >单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -61,7 +76,8 @@ export default {
     return {
       options:[],
       status:'',
-      type:'退货单'
+      type:'退货单',
+      dateSelect:[]
     }
   },
   methods:{
@@ -71,6 +87,17 @@ export default {
     },
     listCreate (param) {
       param.content.type = this.type
+    },
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.list.param.content.pageNumber = 1
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.list.param.content.where.begindate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      this.$refs.list.listData()
     }
   }
 }

src/HDrpManagement/aftersalesBill/index.vue

@@ -16,7 +16,7 @@
       }"
       @listCreate="listCreate"
       @listData="list">
-      <div slot="custom" style="display:flex">
+      <template #custom>
         <!-- <div class="label_center">
           <p class="search__label">类型:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = '';$refs.list.listData()" v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择类型" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = type;$refs.list.listData()">
@@ -24,7 +24,7 @@
             <el-option label="借用归还单" value="借用归还单" />
           </el-select>
         </div> -->
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
             <el-option label="新建" value="新建" />
@@ -33,7 +33,22 @@
             <el-option label="复核" value="复核" />
           </el-select>
         </div>
-      </div>
+        <div class="mt-10">
+          <label class="search__label" >单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -62,7 +77,8 @@ export default {
     return {
       options:[],
       status:'',
-      type:'退货单'
+      type:'退货单',
+      dateSelect:[]
       
     }
   },
@@ -73,6 +89,17 @@ export default {
     list (data) {
       console.log(data);
       
+    },
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.list.param.content.pageNumber = 1
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.list.param.content.where.begindate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      this.$refs.list.listData()
     }
   }
 }

src/HDrpManagement/contractManage/components/addContract.vue

@@ -363,7 +363,14 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="500">
-                  <selectAgent ref="member" type="1" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <el-tabs type="border-card">
+                    <el-tab-pane label="客户">
+                      <selectAgent ref="member" type="2" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                    <el-tab-pane label="经销商">
+                      <selectAgent ref="member" type="1" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                  </el-tabs>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -773,6 +780,7 @@ export default {
       }
     },
     showChange (key) {
+
       this.agentVisible = false
       this.salerVisible = false
       this.projectVisible = false
@@ -805,6 +813,8 @@ export default {
         key ? this[key] = true : ''
       }
 
+      this.$refs.member.listData()
+
 
     },
     agentChange (data) {

src/HDrpManagement/contractManage/components/editContract.vue

@@ -363,7 +363,14 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="400">
-                  <selectAgent type="1" ref="member" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <el-tabs type="border-card">
+                    <el-tab-pane label="客户">
+                      <selectAgent ref="member" type="2" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                    <el-tab-pane label="经销商">
+                      <selectAgent ref="member" type="1" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                  </el-tabs>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -771,6 +778,7 @@ export default {
       }else {
         key ? this[key] = true : ''
       }
+      this.$refs.member.listData()
     },
     onCancel () {
       this.drawer = false

src/HDrpManagement/contractManage/components/selectAgent.vue

@@ -65,9 +65,13 @@ export default {
   },
   methods:{
     async listData () {
-      if(!this.type) this.param.content.type = ''
+      console.log(this.type,'typeValue')
+     /* if(!this.type) this.param.content.where.type = ''*/
+      console.log(this.param,'param')
+      this.param.content.where.type = this.type
       this.param.content.where.typemx = this.typemx
 			this.param.content.where.condition = this.search
+      console.log(this.param)
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total

src/HDrpManagement/dispatch/details/index.vue

@@ -17,7 +17,7 @@
       </div>
       <div slot="customOperation">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
-        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">生成物流单</el-button>
+        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'createBill')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">生成物流单</el-button>
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
         <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?'反复核':'复核'}}</el-button>
       </div>

src/HDrpManagement/dispatch/index.vue

@@ -12,7 +12,23 @@
         :detailPath="{
           path:'/dispatchdetail'
         }">
-        <div slot="custom"></div>
+        <template #custom>
+          <div class="mt-10">
+            <label class="search__label" >发货日期:</label>
+            <el-date-picker
+                style="margin-right: 24px !important;"
+                size="small"
+                @change="selectChange"
+                value-format="yyyy-MM-dd"
+                v-model="dateSelect"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                clearable>
+            </el-date-picker>
+          </div>
+        </template>
         <template v-slot:tbList="scope">
           <div v-if="scope.data.column.columnname == 'STATUS'">
             <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -43,11 +59,23 @@
   export default {
     data () {
       return {
-        options:[]
+        options:[],
+        dateSelect:[]
         
       }
     },
     methods:{
+      selectChange(){
+        if (this.dateSelect !== '' && this.dateSelect !== null){
+          this.$refs.basicLayout.param.content.pageNumber = 1
+          this.$refs.basicLayout.param.content.where.begindate = this.dateSelect[0]
+          this.$refs.basicLayout.param.content.where.enddate = this.dateSelect[1]
+        }else {
+          this.$refs.basicLayout.param.content.where.begindate = ''
+          this.$refs.basicLayout.param.content.where.enddate = ''
+        }
+        this.$refs.basicLayout.listData()
+      }
     }
   }
   

src/HDrpManagement/invoiceapp/index.vue

@@ -14,7 +14,7 @@
         path:'/invoiceDetail'
       }"
       @listData="list">
-      <div slot="custom">
+      <template #custom>
         <div class="mt-10">
           <label class="search__label">状态:</label>
           <el-select class="inline-16" v-model="status" size="small" placeholder="请选择状态" @change="selectChange" clearable>
@@ -24,7 +24,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" >单据日期:</label>
+          <label class="search__label" >制单时间:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -38,7 +38,7 @@
               clearable>
           </el-date-picker>
         </div>
-      </div>
+      </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

src/HDrpManagement/logistics/index.vue

@@ -19,6 +19,21 @@
           <el-input  style="width:200px;" placeholder="搜索" v-model="sonum" @keyup.native.enter="queryData" @clear="queryData" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
+        <div class="mt-10">
+          <label class="search__label" >单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -49,7 +64,8 @@
     data () {
       return {
         options:[],
-        sonum:''
+        sonum:'',
+        dateSelect:[]
         
       }
     },
@@ -58,6 +74,17 @@
         this.$refs.basicLayout.param.content.pageNumber = 1
         this.$refs.basicLayout.param.content.where.sonum = this.sonum
         this.$refs.basicLayout.listData()
+      },
+      selectChange(){
+        if (this.dateSelect !== '' && this.dateSelect !== null){
+          this.$refs.basicLayout.param.content.pageNumber = 1
+          this.$refs.basicLayout.param.content.where.begindate = this.dateSelect[0]
+          this.$refs.basicLayout.param.content.where.enddate = this.dateSelect[1]
+        }else {
+          this.$refs.basicLayout.param.content.where.begindate = ''
+          this.$refs.basicLayout.param.content.where.enddate = ''
+        }
+        this.$refs.basicLayout.listData()
       }
     },
     mounted () {

src/HDrpManagement/orderManage/details/tabs/changeHistory.vue

@@ -6,37 +6,37 @@
       size="small"
       border>
       <el-table-column
-        prop="billno"
+        prop="createby"
         label="变更人"
         width="180">
       </el-table-column>
       <el-table-column
-        prop="status"
+        prop="createdate"
         label="变更时间"
         width="90">
       </el-table-column>
       <el-table-column
-        prop="billdate"
+        prop="itemno"
         label="产品编码">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="itemname"
         label="产品名称">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="model"
         label="型号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="oldvalue"
         label="原数量">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="newvalue"
         label="变更后数量">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="remarks"
         label="变更备注">
       </el-table-column>
     </el-table>

src/HDrpManagement/orderManage/details/tabs/erpHistory.vue

@@ -6,29 +6,29 @@
       size="small"
       border>
       <el-table-column
-        prop="billno"
+        prop="request"
         label="推送人"
         width="180">
       </el-table-column>
       <el-table-column
-        prop="status"
+        prop="createdate"
         label="推送时间"
         width="90">
       </el-table-column>
       <el-table-column
-        prop="billdate"
+        prop="status"
         label="返回状态">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="erpbillno"
         label="erp单据号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="errmsg"
         label="错误信息">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="type"
         label="类型"> 
       </el-table-column>
     </el-table>

src/HDrpManagement/orderManage/details/tabs/writeoff.vue

@@ -11,32 +11,32 @@
         width="180">
       </el-table-column>
       <el-table-column
-        prop="status"
+        prop="billnodate"
         label="核销日期"
-        width="90">
+        width="160">
       </el-table-column>
       <el-table-column
-        prop="billdate"
+        prop="cashbillbillno"
         label="收入凭证号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="writeoffamount"
         label="核销单总金额">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="rowno"
         label="订单行号">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="itemno"
         label="产品编码">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="itemname"
         label="产品名称">
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="ordetitemwriteoffamount"
         label="本次核销金额">
       </el-table-column>
     </el-table>

src/HDrpManagement/orderManage/index.vue

@@ -16,7 +16,7 @@
           <el-button v-if="tool.checkAuth($route.name,'refreshStock')" style="margin-left:16px" size="small" type="primary" @click="refreshStock">刷新库存</el-button>
       </template>
       <template #custom>
-        <div class="label_center mt-10">
+        <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select v-model="where.status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="新建" value="新建"></el-option>
@@ -27,7 +27,7 @@
             <el-option label="关闭" value="关闭"></el-option>
           </el-select>
         </div>
-        <div class="label_center mt-10">
+        <div class="mt-10">
           <p class="search__label">订单类型:</p>
           <el-select v-model="where.type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="标准订单" value="标准订单"></el-option>
@@ -37,7 +37,7 @@
             <el-option label="工具订单" value="工具订单"></el-option>
           </el-select>
         </div>
-        <div class="label_center mt-10">
+        <div class="mt-10">
           <p class="search__label">领域:</p>
           <el-select v-model="where.tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option
@@ -48,7 +48,7 @@
             />
           </el-select>
         </div>
-        <div class="label_center mt-10">
+        <div class="mt-10">
           <p class="search__label">核销状态:</p>
           <el-select v-model="where.writeoffstatus" clearable style="margin-right:10px" size="small" placeholder="请选择核销状态" @change="change">
             <el-option label="已核销" value="已核销"></el-option>
@@ -56,7 +56,7 @@
             <el-option label="未核销" value="未核销"></el-option>
           </el-select>
         </div>
-        <div class="label_center mt-10">
+        <div class="mt-10">
           <p class="search__label">开票状态:</p>
           <el-select v-model="where.invoicestatus" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="change">
             <el-option label="已开票" value="已开票"></el-option>
@@ -64,20 +64,35 @@
             <el-option label="未开票" value="未开票"></el-option>
           </el-select>
         </div>
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">是否退货:</p>
           <el-select v-model="where.isreturn" clearable style="margin-right:10px" size="small" placeholder="请选择退货状态" @change="change">
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
         </div>
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">是否变更:</p>
           <el-select v-model="where.ischange" clearable style="margin-right:10px" size="small" placeholder="请选择变更状态" @change="change">
             <el-option label="未变更" value="0"></el-option>
             <el-option label="已变更" value="1"></el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <label class="search__label" >单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -121,7 +136,8 @@ export default {
         "invoicestatus":'',
         "isreturn": '',
         "ischange": '',
-      }
+      },
+      dateSelect:[]
       
     }
   },
@@ -153,6 +169,17 @@ export default {
         message:'刷新成功',
         type:"success"
       })
+    },
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.basicLayout.param.content.pageNumber = 1
+        this.$refs.basicLayout.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.basicLayout.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.basicLayout.param.content.where.begindate = ''
+        this.$refs.basicLayout.param.content.where.enddate = ''
+      }
+      this.$refs.basicLayout.listData()
     }
   },
   created () {

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -246,7 +246,14 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent type="1" ref="member" :type="false" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <el-tabs type="border-card">
+                    <el-tab-pane label="客户">
+                      <selectAgent ref="member" type="2" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                    <el-tab-pane label="经销商">
+                      <selectAgent ref="member" type="1" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                    </el-tab-pane>
+                  </el-tabs>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -677,6 +684,7 @@ export default {
       }else {
         key ? this[key] = true : ''
       }
+      this.$refs.member.listData()
     },
     clearTime () {
       this.form.begdate = ''

src/HDrpManagement/rebatesettlement/index.vue

@@ -13,7 +13,7 @@
       :detailPath="{
         path:'/rebatesettlement_detail'
       }">
-      <template slot=#custom>
+      <template #custom>
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker

src/HDrpManagement/recvoucher/details/index.vue

@@ -110,13 +110,19 @@ export default {
           label:'账户类型',
           value:this.mainData.accountname
         },
+
         {
-          label:'经销商',
+          label:'企业名称',
           value:this.mainData.enterprisename
         },
         {
+<<<<<<< HEAD
           label:'核销金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
+=======
+          label:'单据日期',
+          value:this.mainData.createdate
+>>>>>>> c772bf5f04ebec0989b1edb76ea41107f2bfa4bd
         },
         {
           label:'分类',
@@ -126,10 +132,6 @@ export default {
           label:'分类明细',
           value:this.mainData.subclass
         },
-        {
-          label:'单据日期',
-          value:this.mainData.createdate
-        },
         {
           label:'凭证来源',
           value:this.mainData.sourse
@@ -142,6 +144,11 @@ export default {
           label:'备注',
           value:this.mainData.remarks
         },
+
+        {
+          label:'核销金额',
+          value:this.mainData.amount
+        },
         {
           label:'未核销金额',
           value:this.mainData.unwriteoffamount

src/HDrpManagement/serveWorkBill/index.vue

@@ -16,9 +16,10 @@
         <div class="label_center">
           <label  class="search__label">状态:</label>
           <el-select class="inline-24" v-model="where.status" placeholder="请选择状态" @change="selectChange" size="small" clearable>
-            <el-option label="待指派" value="待指派"></el-option>
-            <el-option label="待处理" value="待处理"></el-option>
+            <el-option label="待接单" value="待接单"></el-option>
+            <el-option label="待开始" value="待开始"></el-option>
             <el-option label="进行中" value="进行中"></el-option>
+            <el-option label="暂停" value="暂停"></el-option>
             <el-option label="已完成" value="已完成"></el-option>
           </el-select>
         </div>
@@ -41,10 +42,10 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '进行中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待处理'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待指派'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待开始'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '暂停'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+<!--          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>-->
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待接单'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -189,16 +189,16 @@ export default {
               case '进行中':
                 style = {color:'#52c41a'}
                 break;
-              case '待处理':
+              case '待开始':
                 style = {color:'#3874f6'}
                 break;
-              case '新建':
+              case '暂停':
                 style = {color:'#333333'}
                 break;
-              case '提交':
+             /* case '提交':
                 style = {color:'#3874f6'}
-                break; 
-              case '待指派':
+                break; */
+              case '待接单':
                 style = {color:'#fa8c16'}
                 break; 
               case '已完成':
@@ -242,7 +242,37 @@ export default {
           info: [
             {label:'单号',value:this.mainData.billno},
             {label:'申请单号',value:this.mainData.servicebillno},
-            {label:'状态',value:this.mainData.status},
+            {
+              label:'状态',
+              value:this.mainData.status,
+              style:function () {
+                let style = {}
+                switch (that.mainData.status) {
+                  case '进行中':
+                    style = {color:'#52c41a'}
+                    break;
+                  case '待开始':
+                    style = {color:'#3874f6'}
+                    break;
+                  case '暂停':
+                    style = {color:'#333333'}
+                    break;
+                    /* case '提交':
+                       style = {color:'#3874f6'}
+                       break; */
+                  case '待接单':
+                    style = {color:'#fa8c16'}
+                    break;
+                  case '已完成':
+                    style = {color:'#fa8c16'}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+
+              }
+            },
             {label:'经销商编号',value:this.mainData.agentnum},
             {label:'经销商',value:this.mainData.enterprise},
             {label:'业务员',value:this.mainData.scenecontact},

src/HDrpManagement/toolBill/index.vue

@@ -15,9 +15,9 @@
         param:{type:this.type}
       }"
       @listCreate="listCreate">
-      <div slot="custom" style="display:flex">
-        <div  class="label_center">
-        <label class="search__label">创建时间:</label>
+      <template #custom>
+        <div  class="mt-10">
+        <label class="search__label">单据日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -31,7 +31,7 @@
               clearable>
           </el-date-picker>
         </div>
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
             <el-option label="新建" value="新建" />
@@ -40,7 +40,7 @@
             <el-option label="复核" value="复核" />
           </el-select>
         </div>
-      </div>
+      </template>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -80,10 +80,10 @@ export default {
     },
     selectChange(){
       if (this.dateSelect !== '' && this.dateSelect !== null){
-        this.$refs.list.param.content.where.startdate = this.dateSelect[0]
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
         this.$refs.list.param.content.where.enddate = this.dateSelect[1]
       }else {
-        this.$refs.list.param.content.where.startdate = ''
+        this.$refs.list.param.content.where.begindate = ''
         this.$refs.list.param.content.where.enddate = ''
       }
       this.$refs.list.listData()

src/HDrpManagement/toolBillMag/index.vue

@@ -27,7 +27,7 @@
           </el-select>
         </div>
         <div  class="label_center">
-        <label class="search__label">创建时间:</label>
+        <label class="search__label">单据日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"
@@ -83,10 +83,10 @@ export default {
     },
     selectChange(){
       if (this.dateSelect !== '' && this.dateSelect !== null){
-        this.$refs.list.param.content.where.startdate = this.dateSelect[0]
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
         this.$refs.list.param.content.where.enddate = this.dateSelect[1]
       }else {
-        this.$refs.list.param.content.where.startdate = ''
+        this.$refs.list.param.content.where.begindate = ''
         this.$refs.list.param.content.where.enddate = ''
       }
       this.$refs.list.listData()

src/HManagement/notice/index.vue

@@ -184,7 +184,7 @@ export default {
         'id':20221101094603,
         'content': {
           'where': {
-
+            
           }
         }
       })

src/HManagement/notice/list/modules/add_notice.vue

@@ -253,7 +253,8 @@ export default {
           "pageNumber": 1,
           "pageSize": 1000,
           "where": {
-            "condition": ""
+            "condition": "",
+            "issecret":1
           }
         }
       })

src/HManagement/notice/pate/modules/list.vue

@@ -26,8 +26,6 @@
             <el-switch
               :disabled="act_cus !== scope.column.data.sat_notice_classid"
               v-model="scope.column.data.issecret"
-              active-color="#ff4949"
-              inactive-color="#ccc"
               :active-value="1"
               :inactive-value="0">
             </el-switch>

src/HManagement/siteManage/custom_option/modules/list.vue

@@ -1,5 +1,14 @@
 <template>
   <div class="container normal-panel" >
+    <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          v-model="param.content.where.condition" 
+          placeholder="搜索" 
+          @keyup.enter.native="queryOptions()" @clear="queryOptions()" clearable></el-input>
+      </div>
     <tableLayout ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght" @rowClick="rowShow">
       <template v-slot:customcol="scope" >
         <p>{{scope.column.data[scope.column.columnname]}}</p>

src/SDrpManagement/sinvoiceapp/index.vue

@@ -24,7 +24,7 @@
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" >单据日期:</label>
+          <label class="search__label" >提交时间:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
               size="small"