订货订单、订货业务，列表新增备货状态、开票状态、核销状态

src/HDrpManagement/orderManage/index.vue

@@ -161,7 +161,7 @@ export default {
     return {
       options:[],
       tradefieldList:'',
-      "siteid":JSON.parse(sessionStorage.getItem('active_account')).siteid,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       where: {
         "condition":"",
         "status2" : '',

src/SDrpManagement/agentOrder/index.vue

@@ -57,6 +57,14 @@
             <el-option value="未开票" :label="$t(`未开票`)"></el-option>
           </el-select>
         </div>
+        <div class="mt-10" v-if="siteid == 'HY'">
+          <p class="search__label">{{$t(`备货状态`)}}:</p>
+          <el-select v-model="goodsstatus" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择备货状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.goodsstatus = goodsstatus;$refs.basicLayout.listData()">
+            <el-option :label="$t(`已备货`)" value="已备货"></el-option>
+            <el-option :label="$t(`部分备货`)" value="部分备货"></el-option>
+            <el-option :label="$t(`未备货`)" value="未备货"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >{{$t('审核日期')}}:</label>
           <el-date-picker
@@ -83,6 +91,15 @@
         <div v-else-if="scope.data.column.columnname == 'defaultamount'">
           {{ tool.formatAmount(scope.data.column.data.defaultamount,2) }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'writeoffstatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'invoicestatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'" :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
         </div>
@@ -110,7 +127,9 @@ export default {
       type:'',
       writeoffstatus:'',
       invoicestatus:'',
-      dateSelect:[]
+      dateSelect:[],
+      goodsstatus:'',
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     }
   },
   methods:{

src/SDrpManagement/salerOrder/index.vue

@@ -120,6 +120,19 @@
             <el-option :label="$t(`未开票`)" value="未开票"></el-option>
           </el-select>
         </div>
+        <div class="mt-10" v-if="siteid == 'HY'">
+          <p class="search__label">{{$t(`备货状态`)}}:</p>
+          <el-select v-model="goodsstatus" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择备货状态`)" @change="
+              $refs.basicLayout.param.content.pageNumber = 1;
+              $refs.basicLayout.param.content.where.goodsstatus =
+                goodsstatus;
+              $refs.basicLayout.listData();
+            ">
+            <el-option :label="$t(`已备货`)" value="已备货"></el-option>
+            <el-option :label="$t(`部分备货`)" value="部分备货"></el-option>
+            <el-option :label="$t(`未备货`)" value="未备货"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label">{{ $t("审核日期") }}:</label>
           <el-date-picker
@@ -167,6 +180,15 @@
             `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}-${scope.data.column.data.address}`
           }}
         </div>
+        <div v-else-if="scope.data.column.columnname == 'writeoffstatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'invoicestatus'"  :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'goodsstatus'" :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div v-else>
           {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
         </div>
@@ -194,6 +216,8 @@ export default {
       writeoffstatus: "",
       invoicestatus: "",
       dateSelect: [],
+      goodsstatus:"",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     };
   },
   methods: {