Merge branch 'sit'

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -61,7 +61,7 @@ const reColumns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
+    label: "供应商负责人",
     span: 4,
   },
   {
@@ -193,7 +193,7 @@ const coveColumns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
+    label: "供应商负责人",
     span: 4,
   },
   {
@@ -429,7 +429,7 @@ const onlineColumns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
+    label: "供应商负责人",
     span: 4,
   },
   {
@@ -665,7 +665,7 @@ const costColumns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
+    label: "供应商负责人",
     span: 6,
   },
   {

src/components/search-good-modal/columns.js

@@ -64,9 +64,9 @@ export default [
   },
   {
     prop: "creater",
-    label: "采购员",
+    label: "供应商负责人",
     fixed: "right",
-    width: "70px",
+    width: "95",
   },
 
 

src/components/search-good-online-modal/columns.js

@@ -65,9 +65,9 @@ export default [
   },
   {
     prop: "purchase",
-    label: "采购员",
+    label: "供应商负责人",
     fixed: "right",
-    "width": "70",
+    width: "95",
   },
   
 ]

src/components/search-stock-good-modal/columns.js

@@ -44,8 +44,8 @@ export default [
   // },
   // {
   //   prop: "cg_saler",
-  //   label: "采购员",
-  //   width: "60",
+  //   label: "供应商负责人",
+  //  width: "95",
   // },
   // {
   //   prop: "usable_stock",

src/components/show-goods-data-table-modal/columns.js

@@ -44,8 +44,8 @@ export default [
   // },
   // {
   //   prop: "cg_saler",
-  //   label: "采购员",
-  //   width: "60",
+  //   label: "供应商负责人",
+  //   width: "95",
   // },
   // {
   //   prop: "usable_stock",

src/views/dataCorrection/cgMessage/addEdit.vue

@@ -65,10 +65,7 @@
                 <el-dropdown @command="handleClick($event)" :size="searchSize">
                   <el-button :size="searchSize" style="width: 120px">
                     {{ sselect }}
-                    <i
-                      class="el-icon-arrow-down el-icon--right"
-                      :size="searchSize"
-                    ></i>
+                    <i class="el-icon-arrow-down el-icon--right" :size="searchSize"></i>
                   </el-button>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item
@@ -133,7 +130,7 @@
                     <!-- <el-option label="备库编号" value="3"></el-option> -->
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
-                    <el-option label="采购员" value="6"></el-option>
+                    <el-option label="供应商负责人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
                     <el-option label="订单编号" value="8"></el-option>
                   </el-select>
@@ -174,10 +171,8 @@
           <el-tag
             :size="tablebtnSize"
             v-text="
-              (
-                statusOptions.find((item) => item.value == scope.row.status) ||
-                {}
-              ).label || '--'
+              (statusOptions.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
             "
           ></el-tag>
         </template>
@@ -186,9 +181,8 @@
             :size="tablebtnSize"
             v-text="
               (
-                cg_order_type_options.find(
-                  (item) => item.id == scope.row.order_type
-                ) || {}
+                cg_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
               ).label || '--'
             "
           ></el-tag>
@@ -400,5 +394,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/dataCorrection/cgMessage/columns.js

@@ -162,8 +162,8 @@ const columns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "addtime",

src/views/dataCorrection/cgMessageList/columns.js

@@ -6,12 +6,12 @@ const columns = [
   },
   {
     prop: "cgder_old",
-    label: "采购员(修改前)",
+    label: "供应商负责人(修改前)",
     minWidth: "105"
   },
   {
     prop: "cgder",
-    label: "采购员(修改后)",
+    label: "供应商负责人(修改后)",
     minWidth: "105"
   },
   {

src/views/goodStore/goodsOnline/columns.js

@@ -118,8 +118,8 @@ const listCol = [
   },
   {
     prop: "purchase",
-    label: "采购员",
-    width: "70px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "company_name",

src/views/purchaseIn/purchaseOrder/columns.js

@@ -162,14 +162,14 @@ const columns = [
   },
   // {
   //   prop: "company_name",
-  //   label: "采购员部门",
+  //   label: "供应商负责人部门",
   //   minWidth: "100px",
   // },
   
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "good_creater",

src/views/purchaseIn/purchaseOrder/index.vue

@@ -155,10 +155,10 @@
                     <!-- <el-option label="备库编号" value="3"></el-option> -->
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
-                    <el-option label="采购员" value="6"></el-option>
+                    <el-option label="供应商负责人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
                     <el-option label="订单编号" value="8"></el-option>
-                    <el-option label="采购员部门" value="9"></el-option>
+                    <el-option label="供应商负责人部门" value="9"></el-option>
                   </el-select>
                 </el-input>
               </el-col>

src/views/purchaseIn/recovery/columns.js

@@ -47,8 +47,8 @@ const columns = [
   },
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "creater",

src/views/purchaseIn/recovery/index.vue

@@ -57,7 +57,7 @@
               <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
-                  placeholder="采购员部门"
+                  placeholder="供应商负责人部门"
                   v-model="parmValue.company_name"
                   maxlength="40"
                   :size="searchSize"
@@ -115,7 +115,7 @@
               <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
-                  placeholder="采购员部门"
+                  placeholder="供应商负责人部门"
                   v-model="parmValue.company_name"
                   maxlength="40"
                   :size="searchSize"

src/views/purchaseIn/wsmInOrder/columns.js

@@ -94,8 +94,8 @@ export default [
   // 
   // {
   //   prop: "cgder",
-  //   label: "采购员",
-  //   width: "60px",
+  //   label: "供应商负责人",
+  //  width: "95",
   // },
   // {
   //   prop: "good_price",
@@ -155,8 +155,8 @@ export default [
   // },
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "good_creater",

src/views/sellOut/salesOrder/columns.js

@@ -94,8 +94,8 @@ export default [
   },
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "good_creater",

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -7,7 +7,9 @@
       :size="'mini'"
       style="width: 100%"
       row-key="key"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="42"> </el-table-column>
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
@@ -59,7 +61,7 @@
         label="发货时间"
         width="145"
       />
-      <el-table-column fixed="right" width="120">
+      <el-table-column fixed="right" width="150">
         <template slot="header" slot-scope="scope">
           <span v-if="addr_res + '' === '0'">操作</span>
           <el-tooltip
@@ -117,6 +119,19 @@
               @click="openModal(0)"
             ></i>
           </el-tooltip>
+          <el-tooltip
+            effect="dark"
+            content="批量退货"
+            style="margin: 3px 0 0 8px"
+            v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-date tb-icon"
+              style="color: #63cbe7"
+              @click="openModal()"
+            ></i>
+          </el-tooltip>
         </template>
 
         <template slot-scope="scope">
@@ -131,7 +146,7 @@
               @click="routeGoto('sellOutOrderDetail', { id: scope.row.outCode })"
             ></i>
           </el-tooltip>
-          <el-tooltip
+          <!-- <el-tooltip
             effect="dark"
             content="退货"
             v-if="
@@ -141,7 +156,7 @@
             placement="top"
           >
             <i class="el-icon-delete tb-icon" @click="openModal(scope.row)"></i>
-          </el-tooltip>
+          </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
@@ -232,6 +247,7 @@ export default {
       orderCode: "",
       outCode: "",
       addr_res: 0,
+      batch_num: 0,
       addrmodel: false,
       // 状态
       statusOptions: [
@@ -278,6 +294,7 @@ export default {
         curr: 1,
         total: 0,
       },
+      multipleSelection: [],
       resModel: null,
     };
   },
@@ -285,6 +302,9 @@ export default {
     this.initForm();
   },
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     closeModel() {
       this.modelId = "";
       this.modelShowModel = false;
@@ -324,6 +344,7 @@ export default {
         const { list, count } = data;
         this.tableData = list;
         this.pageInfo.total = Number(count);
+        this.batch_num = 0;
         this.tableData.forEach((v) => {
           v.good_class = "";
           if (v.can && v.can.length > 0) {
@@ -331,7 +352,11 @@ export default {
               v.good_class += i === 0 ? x.name : "/" + x.name;
             });
           }
+          if (v.status + "" === "0" || v.status + "" === "1") {
+            this.batch_num += parseInt(v.send_num + "");
+          }
         });
+        console.log(this.batch_num);
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -367,22 +392,42 @@ export default {
           returnT: this.addr_res + "",
           returnAddr: [],
         };
+        this.returnItem = this.resModel;
+        this.returnModel = true;
         //  scope.row.outCode
       } else {
-        const { addrid, send_num, outCode } = e;
-        this.resModel = {
-          good_num: send_num + "",
-          orderCode: this.orderCode,
-          return_type: "2",
-          remark: "", //退货备注
-          errorCode: "", //退货原因
-          thnum: send_num + "",
-          returnT: send_num + "",
-          returnAddr: [{ id: addrid, return_num: send_num }],
-        };
+        let tol = 0,
+          send_num = 0;
+        this.multipleSelection.forEach((s) => {
+          console.log(parseInt(s.send_num + ""));
+          if (!(s.status + "" === "0" || s.status + "" === "1")) {
+            tol += parseInt(s.send_num + "");
+          } else {
+            send_num += parseInt(s.send_num + "");
+          }
+        });
+        console.log(tol, send_num);
+        if (this.multipleSelection.length == 0) {
+          this.$message.warning("请选择发货申请单！");
+        } else if (tol !== 0) {
+          this.$message.warning("不能已发货的发货申请单！");
+        } else {
+          // const { addrid, send_num, outCode } = e;
+          this.resModel = {
+            good_num: send_num + "",
+            orderCode: this.orderCode,
+            return_type: "2",
+            remark: "", //退货备注
+            errorCode: "", //退货原因
+            thnum: send_num + "",
+            returnT: send_num + "",
+            returnAddr: JSON.parse(JSON.stringify(this.multipleSelection)),
+          };
+          this.returnItem = this.resModel;
+          this.returnModel = true;
+        }
       }
-      this.returnItem = this.resModel;
-      this.returnModel = true;
+
       console.log(addModel);
     },
     async restSearch() {

src/views/sellOut/sellReturn/components/addModel.vue

@@ -3,8 +3,8 @@
     :title="'新建退货单'"
     :center="true"
     align="left"
-    top="12vh"
-    width="700px"
+    top="8vh"
+    width="950px"
     @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
@@ -59,14 +59,105 @@
               <el-input
                 :disabled="isDetail"
                 type="textarea"
-                :rows="3"
+                :rows="2"
                 maxlength="250"
                 show-word-limit
                 placeholder="请填写备注"
                 v-model="ruleForm.remark"
               /> </el-form-item
           ></el-col>
+          <el-col :span="24" v-show="ruleForm.return_type === '2'">
+            <el-form-item label="收货信息" :size="'mini'" required>
+              <el-table
+                :data="get_product_go"
+                border
+                :size="'mini'"
+                row-key="key"
+                max-height="300px"
+              >
+                <el-table-column
+                  label="收货人-联系电话-地址"
+                  min-width="300"
+                  show-overflow-tooltip
+                >
+                  <template slot-scope="scope">
+                    {{ scope.row.contactor }}-{{ scope.row.mobile }}-{{
+                      scope.row.addr_info
+                    }}{{ scope.row.addr }}
+                  </template></el-table-column
+                >
+                <!-- <el-table-column label="发货状态" prop="status" width="100px">
+                  <template slot-scope="scope">
+                    <el-tag
+                      :size="'mini'"
+                      :type="scope.row.status == '0' ? 'warning' : ''"
+                      v-text="
+                        (statusOptions.find((item) => item.id == scope.row.status) || {})
+                          .label || '--'
+                      "
+                    ></el-tag> </template
+                ></el-table-column> -->
 
+                <el-table-column label="收货总数量" prop="send_num" width="110" />
+
+                <el-table-column label="退货数量" width="150">
+                  <template slot-scope="scope">
+                    <digital-input
+                      v-show="scope.row.edit"
+                      :values="scope.row.return_num"
+                      :placeholder="'退货数量'"
+                      :min="1"
+                      :disabled="false"
+                      :max="scope.row.send_num"
+                      :position="'right'"
+                      :precision="0"
+                      :newTime="scope.row.newTime"
+                      :size="'mini'"
+                      :controls="false"
+                      :append="''"
+                      @reschange="number_change($event, 'return_num', scope.$index)"
+                    />
+                    <span v-show="!scope.row.edit">
+                      {{ scope.row.return_num }}
+                    </span>
+                  </template>
+                </el-table-column>
+                <el-table-column fixed="right" label="操作" width="50">
+                  <template slot-scope="scope">
+                    <el-tooltip
+                      effect="dark"
+                      content="编辑"
+                      v-if="
+                        !scope.row.edit &&
+                        (scope.row.status === '0' || scope.row.status === '1')
+                      "
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-edit tb-icon"
+                        @click="editRow(scope.$index, 1)"
+                      ></i>
+                    </el-tooltip>
+
+                    <el-tooltip
+                      effect="dark"
+                      content="保存"
+                      v-if="
+                        scope.row.edit &&
+                        (scope.row.status === '0' || scope.row.status === '1')
+                      "
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-circle-check tb-icon"
+                        @click="checkRow(scope.$index, 1)"
+                      ></i>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-row>
               <el-col :span="8">
@@ -86,7 +177,7 @@
                     :values="ruleForm.thnum"
                     :placeholder="'退货数量'"
                     :min="0"
-                    :disabled="false"
+                    :disabled="ruleForm.return_type === '2'"
                     :max="ruleForm.returnT"
                     :position="'right'"
                     :precision="0"
@@ -219,9 +310,20 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-    async number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+    async number_change(e, key, index) {
+      if (index === undefined) {
+        this.ruleForm[key] = e + "" || "0";
+        this.$refs.ruleForm.validateField(key);
+      } else {
+        this.get_product_go[index][key] = e + "" || "0";
+        // this.get_product_go[index].newTime = new Date().valueOf() + "";
+
+        this.$set(this.get_product_go, index, this.get_product_go[index]);
+        this.ruleForm.thnum = 0;
+        this.get_product_go.forEach((s) => {
+          this.ruleForm.thnum += parseInt(s.return_num + "");
+        });
+      }
     },
     return_type_change() {
       const { return_type } = this.ruleForm;
@@ -251,8 +353,16 @@ export default {
             remark, //退货备注
             errorCode, //退货原因
             returnT,
-            returnAddr,
+            returnAddr: [],
           };
+          returnAddr.map((s) => {
+            s.return_num = s.send_num;
+            s.edit = false;
+            s.newTime = new Date().valueOf() + "";
+            return s;
+          });
+
+          this.get_product_go = returnAddr;
         }
       });
     },
@@ -261,6 +371,11 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           if (this.loading) return;
+          const index = this.get_product_go.findIndex((v) => v.edit === true);
+          if (index !== -1) {
+            this.$message.warning("请保存完当前行！");
+            return;
+          }
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           const { good_num, thnum, return_type } = model;
@@ -275,7 +390,15 @@ export default {
             return;
           }
           if (return_type + "" === "2") {
-            model.returnAddr[0].return_num = thnum;
+            // model.returnAddr[0].return_num = thnum;
+            this.get_product_go.forEach((s) => {
+              const { addrid, return_num } = s;
+              const item = {
+                id: addrid,
+                return_num,
+              };
+              model.returnAddr.push(item);
+            });
           }
 
           const { code, data, message } = await asyncRequest.add(model);
@@ -310,6 +433,7 @@ export default {
         return;
       }
       this.get_product_go[rowIndex].edit = false;
+      this.get_product_go[rowIndex].newTime = new Date().valueOf() + "";
       this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex]);
     },
     //编辑某一行
@@ -322,6 +446,7 @@ export default {
         return;
       }
       this.get_product_go[rowIndex].edit = true;
+      this.get_product_go[rowIndex].newTime = new Date().valueOf() + "";
       this.$set(this.get_product_go, rowIndex, this.get_product_go[rowIndex]);
     },
   },
@@ -329,4 +454,3 @@ export default {
 </script>
 
 <style lang="scss" scoped></style>
-/

src/views/sellOut/zixunOrder/columns.js

@@ -534,10 +534,16 @@ const feedbackListCol = [
   },
   {
     prop: "cgder",
-    label: "采购员",
-    width: "60",
+    label: "供应商负责人",
+    width: "95",
+  },
+  {
+    prop: "good_creater",
+    label: "商品创建人",
+    width: "95",
   },
 
+  
   {
     prop: "addtime",
     label: "添加时间",

src/views/standingBook/components/detail3/columns.js

@@ -187,8 +187,8 @@ const listColumns = [
   // 
   // {
   //   prop: "cgder",
-  //   label: "采购员",
-  //   width: "60px",
+  //   label: "供应商负责人",
+  //   width: "95",
   // },
   // {
   //   prop: "good_price",

src/views/stock/check/components/columns.js

@@ -22,8 +22,8 @@ export default [
   },
   // {
   //   prop: "cg_saler",
-  //   label: "采购员",
-  //   width: "60",
+  //   label: "供应商负责人",
+  //  width: "95",
   // },
   // {
   //   prop: "usable_stock",

src/views/stock/goodsRepertory/columns.js

@@ -138,8 +138,8 @@ const listCol = [
   },
   {
     prop: "purchase",
-    label: "采购员",
-    width: "70px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "company_name",

src/views/youzan/othTransferOrderLog/good_columns.js

@@ -114,8 +114,8 @@ const listCol = [
   },
   {
     prop: "purchase",
-    label: "采购员",
-    width: "70px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "company_name",

src/views/youzan/othgoodsOnline/columns.js

@@ -115,8 +115,8 @@ const listCol = [
   },
   {
     prop: "purchase",
-    label: "采购员",
-    width: "70px",
+    label: "供应商负责人",
+    width: "95",
   },
   {
     prop: "company_name",