发货单调整

src/HDrpManagement/dispatch/details/index.vue

@@ -15,13 +15,13 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
-        <el-button class="inline-16" :type="mainData.STATUS !== '复核'?'':'primary'" size="mini"  v-if="tool.checkAuth($route.name,'createBill') && (mainData.STATUS == '新建' || mainData.STATUS == '提交' || mainData.STATUS == '复核')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
-        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.STATUS == '新建'" btnTitle="提交" :disabled="mainData.STATUS !== '新建'" btnType="primary" content="是否确定提交发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
-        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.STATUS == '提交'" btnTitle="撤回" :disabled="mainData.STATUS !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
-        <el-button :type="mainData.STATUS !== '审核' && mainData.STATUS !== '提交'?'':'primary'" class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.STATUS !== '复核' && mainData.STATUS !== '关闭'" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '提交'" @click="onCheck">{{mainData.STATUS === '审核'?$t('反审核'):mainData.STATUS === '复核'?$t('反审核'):$t('审核')}}</el-button>
-        <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.STATUS !== '关闭'" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?$t('反复核'):$t('复核')}}</el-button>
-        <el-button :type="mainData.STATUS != '新建' && mainData.STATUS != '关闭'?'':'primary'" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.STATUS != '新建' && mainData.STATUS != '关闭'">{{$t('删 除')}}</el-button>
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="onSuccess" />
+        <el-button class="inline-16" :type="mainData.status !== '复核'?'':'primary'" size="mini"  v-if="tool.checkAuth($route.name,'createBill') && (mainData.status == '新建' || mainData.status == '提交' || mainData.status == '复核')" :disabled="mainData.status !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
+        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" content="是否确定提交发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
+        <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.status == '提交'" btnTitle="撤回" :disabled="mainData.status !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
+        <el-button :type="mainData.status !== '审核' && mainData.status !== '提交'?'':'primary'" class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '复核' && mainData.status !== '关闭'" :disabled="mainData.status !== '审核' && mainData.status !== '提交'" @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
+        <el-button style="margin-left: 0px"  class="inline-16" :type="mainData.status !== '审核' && mainData.status !== '复核'?'':'primary'" size="mini" v-if="tool.checkAuth($route.name,'recheck') && mainData.status !== '关闭'" :disabled="mainData.status !== '审核' && mainData.status !== '复核'" @click="onReCheck">{{mainData.status === '复核'?$t('反复核'):$t('复核')}}</el-button>
+        <el-button :type="mainData.status != '新建' && mainData.status != '关闭'?'':'primary'" size="mini" @click="onDel" style="margin-left: 0px" class="inline-16" :disabled="mainData.status != '新建' && mainData.status != '关闭'">{{$t('删 除')}}</el-button>
       </div>
       <div slot="slot2" >
         <default-info :mainData="mainData"></default-info>
@@ -101,9 +101,9 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'状态',
-            value:this.$t(this.mainData.STATUS),
+            value:this.$t(this.mainData.status),
             style:function () {
-              let style = that.tool.getStatusColor(that.mainData.STATUS)
+              let style = that.tool.getStatusColor(that.mainData.status)
               return style
             }
           },
@@ -149,13 +149,13 @@ import defaultInfo from '../modules/defaultInfo.vue'
         this.$emit('onSuccess')
       },
       onCheck () {
-        this.$confirm(`${this.$t(`确定`)}${this.mainData.STATUS === '审核'?this.$t('反审核'):this.$t('审核')}${this.$t(`该发货单`)}`, this.$t('提示'), {
+        this.$confirm(`${this.$t(`确定`)}${this.mainData.status === '审核'?this.$t('反审核'):this.$t('审核')}${this.$t(`该发货单`)}`, this.$t('提示'), {
           confirmButtonText: this.$t('确定'),
           cancelButtonText: this.$t('取消'),
           type: 'warning'
         }).then(async () => {
           const res = await this.$api.requested({
-            "id": this.mainData.STATUS === '审核'?20221114135703:20221114135603,
+            "id": this.mainData.status === '审核'?20221114135703:20221114135603,
             "version":1,
             "content": {
                 "sa_dispatchid":this.$route.query.id
@@ -173,7 +173,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
         });
       },
       onReCheck() {
-        this.$confirm(`${this.$t(`确定`)}${this.mainData.STATUS === '复核'?this.$t('反复核'):this.$t('复核')}${this.$t(`该发货单`)}`, this.$t('提示'), {
+        this.$confirm(`${this.$t(`确定`)}${this.mainData.status === '复核'?this.$t('反复核'):this.$t('复核')}${this.$t(`该发货单`)}`, this.$t('提示'), {
           confirmButtonText: this.$t('确定'),
           cancelButtonText: this.$t('取消'),
           type: 'warning'
@@ -183,7 +183,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
             "version":1,
             "content": {
               "sa_dispatchid":this.$route.query.id,
-              "isrecheck":this.mainData.STATUS === '复核'?false:true
+              "isrecheck":this.mainData.status === '复核'?false:true
             }
           })
           this.tool.showMessage(res,()=>{

src/HDrpManagement/dispatch/index.vue

@@ -40,12 +40,8 @@
           </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]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <div v-if="scope.data.column.columnname == 'status'">
+            <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           </div>
           <div v-else-if="scope.data.column.columnname == 'sumamount'">
             {{ scope.data.column.data.sumamount ? tool.formatAmount(scope.data.column.data.sumamount,2) : '--' }}

src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -7,8 +7,8 @@
       <el-descriptions-item :label="$t(`发货日期`)">{{ mainData.billdate?mainData.billdate:"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t(`企业编号`)">{{ mainData.agentnum?mainData.agentnum:"--" }}</el-descriptions-item>
       <el-descriptions-item :label="$t(`企业名称`)">{{ mainData.enterprisename?mainData.enterprisename:"--" }}</el-descriptions-item>
-      <el-descriptions-item :style="style(mainData.STATUS)" :label="$t('状态')">
-        <span :style="colorStyle">{{ mainData.STATUS?$t(mainData.STATUS):"--" }}</span>
+      <el-descriptions-item :label="$t('状态')">
+        <span :style="tool.getStatusColor(mainData.status)">{{ mainData.status?$t(mainData.status):"--" }}</span>
       </el-descriptions-item>
       <el-descriptions-item :label="$t('备注')">{{ mainData.remarks?mainData.remarks:"--" }}</el-descriptions-item>
     </el-descriptions>

src/HDrpManagement/dispatch/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :disabled="data.STATUS !=='新建'" type="primary" size="mini" @click="onShow(drawer = true)">{{$t('编辑')}}</el-button>
+    <el-button :disabled="data.status !=='新建'" type="primary" size="mini" @click="onShow(drawer = true)">{{$t('编辑')}}</el-button>
     <el-drawer
     :visible.sync="drawer"
     direction="rtl"

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="10">
       <el-col :span="setcol">
         <div class="flex-align-center">
-          <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.STATUS !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?$t('添 加'):$t('取 消')}}</el-button>
+          <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?$t('添 加'):$t('取 消')}}</el-button>
         </div>
         <Table
           height="calc(100vh - 500px)"
@@ -13,20 +13,20 @@
           :custom="true" :checkbox="true" fixedName="rowno orderRowno itemname itemno erpitemno model" redirect="left">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'qty'">
-              <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.STATUS === '新建'" size="mini" v-model="scope.column.data.qty" :min="1" :max="scope.column.data.undeliqty" :label="$t(`输入数量`)" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+              <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建'" size="mini" v-model="scope.column.data.qty" :min="1" :max="scope.column.data.undeliqty" :label="$t(`输入数量`)" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
               <span v-else>{{scope.column.data.qty}}</span>
             </div>
             <div v-else-if="scope.column.columnname === 'price'">
               {{tool.formatAmount(scope.column.data.price,2)}}
             </div>
             <div v-else-if="scope.column.columnname === 'remarks'">
-              <el-input v-if="data.STATUS === '新建'" v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
+              <el-input v-if="data.status === '新建'" v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
               <p v-else>{{scope.column.data.remarks}}</p>
             </div>
             <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)" :disabled="data.STATUS === '审核' || data.STATUS === '复核' || data.STATUS === '关闭'">{{$t(`删 除`)}}</el-button>
+            <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)" :disabled="data.status === '审核' || data.status === '复核' || data.status === '关闭'">{{$t(`删 除`)}}</el-button>
           </template>
         </Table>
     <!-- <el-table