build

src/apis/service/sellOut/sellAfterApply/index.js

@@ -22,7 +22,7 @@ export default {
   afterPost: (data, params) => http(api + 'afterpost ', data, 'post', params),
   afterChild: (data, params) => http(api + 'order_return_child_list ', data, 'post', params),
   express: (data, params) => http(api + 'setdelivery ', data, 'post', params),
-  sendList: (data, params) => http(api + 'child_list ', data, 'post', params),
+  sendList: (data, params) => http(api + 'child_out_get_list ', data, 'post', params),
   reorderChildAdd: (data, params) => http(api + 'reorder_child_add ', data, 'post', params),
   deliveryOrderReturnChild: (data, params) => http(api + 'delivery_order_return_child ', data, 'post', params),
   setOrderReturnChild: (data, params) => http(api + 'set_order_return_child ', data, 'post', params)

src/apis/service/sellOut/sellReturn/index.js

@@ -16,7 +16,7 @@ export default {
   status: (data, params) => http(api + 'reorderexam', data, 'post', params),
   //
   getReason: (data, params) => http(api + 'resultlist', data, 'post', params),
-  // 退货审核
+  // 退货审核p
   returnCheck: (data, params) => http(api + 'reorderexam', data, 'post', params),
   child_list: (data, params) => http(api + 'reorder_child_list', data, 'post', params),
   reorderRool: (data, params) => http(api + 'reorderool', data, 'post', params),

src/components/flow-chart/tasks/_normal.js

@@ -13,23 +13,55 @@ class NormalTaskModel extends RectNodeModel {
 
     return style
   }
-  getDefaultAnchor() {
-    const { x, y, id } = this
-    return [
-      {
-        x: x,
-        y: y + 15,
-        name: 'bottom',
-        id: `${id}_0`
-      },
-      {
-        x: x,
-        y: y - 15,
-        name: 'top',
-        id: `${id}_0`
-      }
-    ]
-  }
+  // getDefaultAnchor() {
+  //   const { x, y, id } = this
+  //   const position = this.properties.position
+
+  //   switch (position) {
+  //     case 'x':
+  //       return [
+  //         {
+  //           x: 0,
+  //           y: y - 15,
+  //           name: 'left',
+  //           id: `${id}_1`
+  //         },
+  //         {
+  //           x: 0,
+  //           y: y - 15,
+  //           name: 'right',
+  //           id: `${id}_2`
+  //         },
+  //         {
+  //           x: x,
+  //           y: y + 15,
+  //           name: 'bottom',
+  //           id: `${id}_3`
+  //         },
+  //         {
+  //           x: x,
+  //           y: y - 15,
+  //           name: 'top',
+  //           id: `${id}_4`
+  //         }
+  //       ]
+  //     default:
+  //       return [
+  //         {
+  //           x: x,
+  //           y: y + 15,
+  //           name: 'bottom',
+  //           id: `${id}_0`
+  //         },
+  //         {
+  //           x: x,
+  //           y: y - 15,
+  //           name: 'top',
+  //           id: `${id}_0`
+  //         }
+  //       ]
+  //   }
+  // }
 }
 
 class NormalTaskView extends RectNode {}

src/components/flow-chart/tasks/_normal_left.js

@@ -0,0 +1,41 @@
+import { RectNode, RectNodeModel } from '@logicflow/core'
+
+class NormalLeftTaskModel extends RectNodeModel {
+  initNodeData(data) {
+    super.initNodeData(data)
+    this.height = 30
+  }
+  getNodeStyle() {
+    const style = super.getNodeStyle()
+    style.fill = '#fff'
+    style.strokeWidth = 1
+    style.stroke = '#ccc'
+
+    return style
+  }
+  getDefaultAnchor() {
+    const { x, y, id } = this
+    return [
+      {
+        x: x,
+        y: y + 15,
+        name: 'bottom',
+        id: `${id}_0`
+      },
+      {
+        x: x,
+        y: y - 15,
+        name: 'top',
+        id: `${id}_0`
+      }
+    ]
+  }
+}
+
+class NormalTaskView extends RectNode {}
+
+export default {
+  type: 'NormalLeftTask',
+  model: NormalLeftTaskModel,
+  view: NormalTaskView
+}

src/components/globalComponents/search-stock/main.vue

@@ -110,9 +110,25 @@ export default {
     //   }
     // },
     companyNo: {
-      handler: function(val, old) {
+      handler: async function(val, old) {
         if (this.isRelation && val !== '') {
-          this.remoteMethod(val)
+          const [item] = await this.remoteMethod(val) || []
+          if (this.isDetail && item) {
+            const model = {
+              id: this.options[0].id,
+              code: this.options[0].wsm_code,
+              label: this.options[0].name,
+              contactor: this.options[0].wsm_name,
+              mobile: this.options[0].mobile,
+              addr: this.options[0].wsm_addr,
+              addr_code: this.options[0].addr_code,
+              addr_cn: this.options[0].addr_cn,
+              supplierNo: this.options[0].supplierNo,
+              supplierName: this.options[0].supplierName,
+              contactor_name: this.options[0].contactor_name
+            }
+            this.$emit('searchChange', model)
+          }
         }
       },
       immediate: true
@@ -169,6 +185,7 @@ export default {
       if (code === 0) {
         const { list } = data
         this.options = list
+        return list
       } else if (code >= 100 && code <= 104) {
         await this.logout()
       } else {

src/views/goodStore/goodsOnline/columns.js

@@ -1,5 +1,5 @@
 
-// 是否定制
+// 是否定制 是否合规
 const options1 = [
   { id: '0', name: '否' },
   { id: '1', name: '是' }
@@ -105,6 +105,12 @@ const listCol = [
     _slot_: 'good_type',
     width: '70px'
   },
+  {
+    prop: 'is_compliance',
+    label: '是否合规',
+    _slot_: 'is_compliance',
+    width: '70'
+  },
   {
     prop: 'brand_name',
     label: '品牌'

src/views/goodStore/goodsOnline/index.vue

@@ -243,6 +243,16 @@
         ></el-tag>
       </template>
 
+      <template #is_compliance="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="scope.row.is_compliance == '0' ? 'warning' : ''"
+          v-text="
+            (options1.find((item) => item.id == scope.row.is_compliance) || {}).name || '--'
+          "
+        ></el-tag>
+      </template>
+
       <template #operation="{ scope }">
         <el-tooltip
           v-if="powers.some((i) => i == '007')"
@@ -397,7 +407,7 @@
       @cancel="showModel = false"
     />
 
-    <compiance-modal :visible.sync="compianceModalVisible" :sitem="sitem" />
+    <compiance-modal :visible.sync="compianceModalVisible" :sitem="sitem" @refresh="() => searchList()" />
   </div>
 </template>
 <script>

src/views/sellOut/bargainList/detail.vue

@@ -319,7 +319,7 @@ export default {
             const { after_price, lower_price } = this.sitem;
             if (
              (after_price * 1 < lower_price * 1  &&
-              state + "" + "" === "1") || (lower_price * 1 === 0)
+              state + "" + "" === "1")
             ) {
               this.loading = false;
               await this.$confirm(

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -51,14 +51,14 @@
             <template slot-scope="scope">
               <el-form-item :prop="`${scope.$index}.return_wsm_code`" :rules="paramsRules.return_wsm_code">
                 <search-stock
-                  :is-detail="false"
+                  :is-detail="isStock"
+                  :disabled="isStock"
                   :size="'mini'"
                   :value="list[scope.$index].return_wsm_code"
                   :placeholder="'仓库名称'"
                   :is-relation="true"
                   :wsmtype="'5'"
                   :company-no="currentCompany"
-                  :disbaled="!currentCompany"
                   :names="''"
                   @searchChange="onStockChange($event, scope.$index)"
                 />
@@ -93,6 +93,10 @@ export default {
     companyNo: ''
   }),
   computed: {
+    isStock() {
+      const { order_type } = this.sitem || {}
+      return order_type === '1'
+    },
     paramsRules() {
       return ({
         return_wsm_code: [{
@@ -106,14 +110,17 @@ export default {
   watch: {
     sitem: {
       async handler() {
-        if (!this.sitem || !this.sitem.outCode) {
-          return
-        }
-
-        const { data, code, message } = await asyncRequest.sendList({ outCode: this.sitem.outCode })
+        if (!this.sitem || !this.sitem.outCode) { return }
+        const { outCode, order_type } = this.sitem
+        const isStock = order_type === '1'
+        const { data, code, message } = await asyncRequest.sendList({ outCode })
         switch (code) {
           case 0:
-            this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+            this.list = data.map(item => ({
+              ...item,
+              return_num: 0,
+              return_wsm_code: isStock ? [item.wsm_code] : '' }
+            ))
             break
           default:
             this.$message.warning(message)
@@ -127,9 +134,9 @@ export default {
     onStockChange({ code, supplierName, supplierNo, contactor_name } = {}, index) {
       this.$set(this.list, index, {
         ...this.list[index],
-        return_wsm_code: code ? [code] : '',
-        returnSupplierName: supplierName,
         returnSupplierNo: supplierNo,
+        returnSupplierName: supplierName,
+        return_wsm_code: code ? [code] : '',
         returnSupplierNameContactor: contactor_name
       })
 
@@ -146,9 +153,9 @@ export default {
         if (!isValid) return
 
         const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
-          return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
+          return_num,
           outChildCode,
-          return_num
+          return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code
         }))
 
         const { code, message } = await asyncRequest.setOrderReturnChild({

src/views/sellOut/sellAfterApply/detail.vue

@@ -202,9 +202,9 @@
           />
         </el-tab-pane>
 
-        <el-tab-pane label="流程图" name="4"  v-if="newTime !== ''">
+        <!-- <el-tab-pane label="流程图" name="4"  v-if="newTime !== ''">
           <flow-chart process_id="6" type="SHD" :orderCode="orderCode" />
-       </el-tab-pane>
+       </el-tab-pane> -->
       </el-tabs>
     </div>
     <div v-else>

src/views/sellOut/sellAfterApply/index.vue

@@ -104,7 +104,6 @@
                   >
                     <el-option label="售后退货编号" value="serviceNum"></el-option>
                     <el-option label="发货单编号" value="sellOutNum"></el-option>
-
                     <el-option label="销售订单编号" value="sellOrderNum"></el-option>
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>

src/views/sellOut/sellReturn/components/child-list.vue

@@ -26,11 +26,17 @@
 
       <el-table-column
         show-overflow-tooltip
-        prop="orderCode"
+        prop="return_num"
         label="退货数量"
         width="80"
       />
 
+      <el-table-column show-overflow-tooltip prop="is_sale_return_child" label="是否设置售前退货工单" width="145">
+        <template slot-scope="scope">
+          <el-tag size="mini">{{scope.row.is_sale_return_child === '0' ? '未设置' : '已设置'}}</el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column show-overflow-tooltip prop="contactor" label="联系人" width="120" />
       <el-table-column show-overflow-tooltip prop="mobile" label="手机号" width="140" />
       <el-table-column show-overflow-tooltip prop="addr_code_cn" label="省市区" min-width="140" />
@@ -72,7 +78,10 @@ export default {
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-
+    isStock() {
+      const { order_type } = this.sitem || {}
+      return order_type === '1'
+    },
     powers() {
       const tran =
         this.$store.getters.btnList.find(
@@ -161,10 +170,13 @@ export default {
     },
     // 列表搜索
     async searchList() {
-      const { code, data } = await asyncRequest.reorderRool({outCode: this.sitem.outCode});
+      const { code, data } = await asyncRequest.reorderRool({returnCode: this.sitem.returnCode});
+      console.log(this.sitem)
       if (code === 0) {
         const { list } = data;
         this.tableData = list;
+        /* 从发货信息中拿到第一条数据 **/
+        this.$emit('getSendInfoFirst', list[0])
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -6,6 +6,7 @@
           <el-table-column prop="orderCode" label="销售订单" width="160px" show-overflow-tooltip />
           <el-table-column prop="outCode" label="发货单" width="160px" show-overflow-toolti />
           <el-table-column prop="outChildCode" label="发货工单" width="160px" show-overflow-tooltip />
+          <el-table-column prop="num" width="100px" label="发货数量" show-overflow-tooltip />
           <el-table-column label="发货仓库名称" prop="wsm_name" width="180px" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-popover placement="top" width="380" trigger="hover">
@@ -21,7 +22,6 @@
               <span>{{ scope.row.wsm_name }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="num" label="发货数量" show-overflow-tooltip />
           <el-form>
             <el-table-column width="110px" show-overflow-tooltip>
               <template slot="header">
@@ -44,21 +44,21 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column width="160px" show-overflow-tooltip>
+            <el-table-column min-width="160px" show-overflow-tooltip>
               <template slot="header">
                 <span style="color:red;margin-right:2px">*</span>退货仓库编码
               </template>
               <template slot-scope="scope">
                 <el-form-item :prop="`${scope.$index}.return_wsm_code`" :rules="paramsRules.return_wsm_code">
                   <search-stock
-                    :is-detail="false"
                     :size="'mini'"
                     :value="list[scope.$index].return_wsm_code"
                     :placeholder="'仓库名称'"
                     :is-relation="true"
                     :wsmtype="'5'"
                     :company-no="currentCompany"
-                    :disbaled="!currentCompany"
+                    :is-detail="state.isStock"
+                    :disabled="state.isStock"
                     :names="''"
                     @searchChange="onStockChange($event, scope.$index)"
                   />
@@ -67,8 +67,8 @@
             </el-table-column>
           </el-form>
           <el-table-column label="退货仓库" align="center">
-            <el-table-column label="所在供应商名称" prop="returnSupplierName" width="160px" show-overflow-tooltip />
-            <el-table-column label="所在供应商编码" prop="returnSupplierNo" width="160px" show-overflow-tooltip />
+            <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
+            <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
             <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
           </el-table-column>
         </el-table>
@@ -80,14 +80,12 @@
         <el-form-item prop="return_wsm_code" label="销售仓">
           <search-stock
             style="width:300px"
-            :is-detail="false"
             :size="'mini'"
             :value="wsmCode"
             :placeholder="'销售仓'"
             :is-relation="true"
             :wsmtype="'5'"
             :company-no="currentCompany"
-            :disbaled="!currentCompany"
             :names="''"
             @searchChange="onStockChange1($event)"
           />
@@ -106,7 +104,7 @@ import resToken from '@/mixins/resToken'
 export default {
   name: 'WorkOrder',
   mixins: [resToken, companyHelper],
-  props: ['sitem'],
+  props: ['sitem', 'outItem'],
   data: () => ({
     list: [],
     loading: false,
@@ -120,7 +118,7 @@ export default {
   computed: {
     state() {
       const { order_type, send_type } = this.sitem || {}
-
+      console.log(String(order_type) === '1')
       return ({
         isHasWorkOrder: this.list && this.list.length !== 0, // true:有发货工单 false：无发货工单
         isStock: String(order_type) === '1', // true:库存品 false：非库存品/采返商品/报备商品
@@ -146,12 +144,11 @@ export default {
     }
   },
   watch: {
-    sitem: {
+    outItem: {
       handler() {
-        if (!this.sitem) return
+        if (!this.outItem) return
         this.onRequestSendList()
-      },
-      immediate: true
+      }
     }
   },
   methods: {
@@ -160,10 +157,14 @@ export default {
       this.$nextTick(() => this.$refs.formRef.validate())
     },
     async onRequestSendList() {
-      const { data, code, message } = await asyncRequest.sendList({ orderCode: this.sitem.orderCode })
+      const { data, code, message } = await asyncRequest.sendList({ outCode: this.outItem.outCode })
       switch (code) {
         case 0:
-          this.list = data.list.map(item => ({ ...item, return_num: 0, return_wsm_code: '' }))
+          this.list = data.map(item => ({
+            ...item,
+            return_num: 0,
+            return_wsm_code: this.sitem.order_type === '1' ? [item.wsm_code] : '' }
+          ))
           break
         default:
           this.$message.warning(message)
@@ -191,13 +192,23 @@ export default {
       this.$refs.formRef.validate(async isValid => {
         if (!isValid) return
 
-        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => ({
-          return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
-          outChildCode,
-          return_num
-        }))
+        let sum = 0
+        const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => {
+          sum += return_num
+          return {
+            return_wsm_code: Array.isArray(return_wsm_code) ? return_wsm_code[0] : return_wsm_code,
+            outChildCode,
+            return_num
+          }
+        })
+
+        if (sum !== Number(this.outItem.return_num)) {
+          this.$message.warning('退货数量的和必须与发货单的退货数量一致')
+          return
+        }
+
+        const salesWarehouseParams = { list, returnCode: this.sitem.returnCode, outCode: this.outItem.outCode }
 
-        const salesWarehouseParams = { list, type: '1', returnCode: this.sitem.returnCode }
         const parms = {
           list: [{
             return_wsm_code: Array.isArray(this.formData.return_wsm_code)
@@ -206,7 +217,7 @@ export default {
             return_num: this.sitem.num
           }],
           returnCode: this.sitem.returnCode,
-          type: '1'
+          outCode: this.outItem.outCode
         }
 
         const { code, message } = await asyncRequest.reorderChildAdd(this.isSalesWarehouselist ? salesWarehouseParams : parms)

src/views/sellOut/sellReturn/detail.vue

@@ -140,20 +140,11 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="发货信息" name="8" v-if="sitem && sitem.is_addr === '1'">
-              <child-list :sitem="sitem" />
-            </el-collapse-item>
-            
-            <el-collapse-item title="商品信息" name="2">
-              <show-goods-data-table
-                :newTime="newTime"
-                v-if="newTime !== ''"
-                :type="sitem && sitem.order_type ? sitem.order_type : ''"
-                :skucode="sitem.skuCode"
-                :spucode="sitem.good_code"
-                :iscgd="false"
-              />
+
+            <el-collapse-item title="申请退货的发货单" name="8" v-if="sitem && sitem.is_addr === '1'">
+              <child-list ref="childListRef" :sitem="sitem" @getSendInfoFirst="onGetSendInfoFirst"/>
             </el-collapse-item>
+
             <el-collapse-item title="待业务审核" name="3" v-if="isHasPermission({status:'1', process:'1'})">
               <exam-form
                 v-if="newTime"
@@ -177,6 +168,7 @@
             <el-collapse-item title="供应商已驳回,待采购审核" name="5" v-if="isHasPermission({status:'8', process:'8'})">
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseExam" />
             </el-collapse-item>
+            
             <el-collapse-item title="业务公司修改，待供应商确认" name="6" v-if="isHasPermission({status:'10', process:'10'})">
               <exam-form
                 v-if="newTime"
@@ -189,7 +181,18 @@
             </el-collapse-item>
 
             <el-collapse-item title="待设置工单" name="7" v-if="isHasPermission({status:'11',process:'11'})">
-              <set-work-order :sitem="sitem" @reload="initData()" />
+              <set-work-order :sitem="sitem" :outItem="outItem" @reload="handleReload" />
+            </el-collapse-item>
+
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem && sitem.order_type ? sitem.order_type : ''"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+                :iscgd="false"
+              />
             </el-collapse-item>
 
           </el-collapse>
@@ -237,12 +240,6 @@ export default {
   },
   computed: {
     ...mapGetters(['isSupertube']),
-    edgeMode(){
-      const { order_type } = this.sitem;
-      return ({
-        isStock: order_type === '1',
-      })
-    },
     powers() {
       const tran =
         this.$store.getters.btnList.find(
@@ -262,6 +259,7 @@ export default {
     return {
       activeTabs: "1",
       showColumns: showColumns,
+      outItem: {},
       statusOptions: [
         { value: "1", label: "待业务审批" },
         { value: "4", label: "退货完成" },
@@ -276,7 +274,6 @@ export default {
       xs_order_type_options,
       sitem: null, //传给组件
       activeNames: ["0", "1", "2", "3", "4", "5", "6", "7","8",'10'],
-      sitem: null,
       status: "", //存储详情接口状态
       statusList: [
         {
@@ -317,9 +314,17 @@ export default {
       ]
     },
     createEdges(){
-      return [
-      
-      ]
+        return [
+          {"sourceNodeId":"0","targetNodeId":"1","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"1","targetNodeId":"9","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"9","targetNodeId":"8","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"8","targetNodeId":"11","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"11","targetNodeId":"12","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"10","targetNodeId":"4","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"10","targetNodeId":"8","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"11","targetNodeId":"12","isHitable":false,"type":"dashe-edge"},
+          {"sourceNodeId":"12","targetNodeId":"4","isHitable":false,"type":"dashe-edge"},
+        ]
     },
     renderChart(){
       this.$refs.flowChart.render({
@@ -327,6 +332,9 @@ export default {
         edges: this.createEdges()
       })
     },
+    onGetSendInfoFirst(item){
+      this.outItem = item;
+    },
     async statusConfirm(status, message, remark) {
       this.$confirm(`确定要${message}？`, {
         confirmButtonText: "确定",
@@ -363,6 +371,11 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
+   async handleReload(){
+    this.initData()
+    /*  重新获取最第一条退货单 **/
+    this.$refs.childListRef && this.$refs.childListRef.searchList()
+   },
     // async requsetReorderRool(returnCode){
     //   let res = await asyncRequest.reorderRool({returnCode});
     // },
@@ -426,7 +439,6 @@ export default {
     
     async initData() {
       const { code, data, message } = await asyncRequest.detail({ returnCode: this.queryId });
-      const {data:roolData} = await asyncRequest.reorderRool({returnCode: data.returnCode});
 
       if (code === 0) {
         const { is_stock, status } = data;

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -40,7 +40,7 @@
                 </template>
 
                 <template slot="record">
-                  <div  class="ql-editor"  v-html="sitem.record"></div>
+                  <div class="ql-editor"  v-html="sitem.record"></div>
                 </template>
 
                 <template slot="supplierName">