fix: 商家

src/components/LogisticsTabs/index.vue

@@ -118,7 +118,6 @@ export default {
         {
           columnAttributes: {
             label: '序号',
-            prop: 'materialName',
             type: 'index'
           }
         },
@@ -131,7 +130,7 @@ export default {
         {
           columnAttributes: {
             label: '调拨单号',
-            prop: 'materialName'
+            prop: 'orderCode'
           }
         },
         {
@@ -161,25 +160,25 @@ export default {
         {
           columnAttributes: {
             label: '规格型号',
-            prop: 'materialName'
+            prop: 'materialSpecification'
           }
         },
         {
           columnAttributes: {
             label: '单价',
-            prop: 'materialName'
+            prop: 'price'
           }
         },
         {
           columnAttributes: {
             label: '数量',
-            prop: 'materialName'
+            prop: 'qty'
           }
         },
         {
           columnAttributes: {
             label: '物流费用',
-            prop: 'materialName'
+            prop: 'totalCost'
           }
         },
         {
@@ -225,7 +224,6 @@ export default {
         {
           columnAttributes: {
             label: '序号',
-            prop: 'materialName',
             type: 'index'
           }
         },

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -5,13 +5,13 @@
     <sales-table :data-list="dataList" :column="column" @handleSelection="handleSelection">
       <template #events>
         <el-button
-          v-if="details.status == 1 && !isFront"
+          v-if="details.stockType == 1 || (details.status == 1 &&details.stockType == 1 )"
           type="primary"
           size="mini"
           @click="handleInform(2)"
         >通知发货</el-button>
-        <el-button v-if="details.status == 2 && !isFront" size="mini" @click="handleSendRevoke(1)">撤销发货</el-button>
-        <el-button v-if="isFront && details.status == 1" type="primary" size="mini" @click="handleSignIn(4)">
+        <el-button v-if="details.stockType == 1 || (details.status == 2 && details.stockType == 1 )" size="mini" @click="handleSendRevoke(1)">撤销发货</el-button>
+        <el-button v-if="details.stockType == 2 || (details.status == 1 && details.stockType == 2)" type="primary" size="mini" @click="handleSignIn(4)">
           签收
         </el-button>
       </template>

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -23,7 +23,7 @@
         <div v-if="!detailsId">
           <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
           <el-button v-if="dis" size="mini" @click="onReset">重置 </el-button>
-          <el-button v-if="!isFront" size="mini" :disabled="dis" @click="handleInform(2)">通知发货</el-button>
+          <el-button v-if="stokType == 1 " size="mini" :disabled="dis" @click="handleInform(2)">通知发货</el-button>
         </div>
         <div v-else>
           <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
@@ -114,12 +114,14 @@ export default {
       ],
       isFront: JSON.parse(localStorage.getItem('supply_user')).isFront,
       salesId: '',
-      stokType: null
+      stokType: null,
+      details: {}
     }
   },
   created() {
     if (this.detailsId) {
       getFrontOrderDetail({ id: this.detailsId }).then(res => {
+        this.details = res.data
         this.dataList = res.data.orders
         // this.dataList  = res.data.orders.map(k => {
         //   k.disabledId = k.customerStockId
@@ -337,9 +339,10 @@ export default {
                   type: 'text'
                 }
               ]
-              if (this.isFront === false) {
+              if (this.stokType === 2) {
                 this.handleBack()
-              } this.salesId = res.data
+              }
+              this.salesId = res.data
               this.$set(this.$refs.header.screenForm, 'id', res.data)
               this.$forceUpdate()
             })

src/views/supply/policy/components/retail_form.vue

@@ -865,6 +865,9 @@ export default {
       handler(newValue, oldValue) {
         if (newValue && newValue.length) {
           newValue.forEach((item, index) => {
+            if (this.mainForm.isAllDirect) {
+              this.$set(this.goodsList[index], 'isDirectTransfer', true)
+            }
             this.goodsList[index].policyConditionId = this.policyConditionId
             if (this.correspondId) {
               this.goodsList[index].correspondName = this.correspondName

src/views/supply/retail/components/retail_form.vue

@@ -679,6 +679,9 @@ export default {
         if (newValue && newValue.length) {
           newValue.forEach((item, index) => {
             console.log(this.correspondName)
+            if (this.mainForm.isAllDirect) {
+              this.$set(this.goodsList[index], 'isDirectTransfer', true)
+            }
             if (this.correspondId) {
               this.goodsList[index].correspondName = this.correspondName
               this.goodsList[index].correspondId = this.correspondId