2023-2-26

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/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/HManagement/notice/index.vue

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

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

@@ -247,7 +247,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>