Merge remote-tracking branch 'origin/dev' into dev

src/views/purchase/DemandSummary/add/index.vue

@@ -116,6 +116,16 @@ export default {
         row.additionalSupplierName = null;
       }
     },
+    // 采购组织
+    changeOrg(prop, row) {
+      this.clearOrg(row);
+    },
+    clearOrg(row) {
+      row.deliveryWarehouse = null;
+      row.deliveryWarehouseName = null;
+      row.deliveryAllocation = null;
+      row.deliveryAllocationName = null;
+    },
   },
   created() {},
 };
@@ -271,6 +281,8 @@ export default {
           :size="$attrs.size"
           :source.sync="scope.row"
           :disabled="!isEdit || scope.row.status !== '1'"
+          @clear="clearOrg(scope.row)"
+          @change="(val) => changeOrg(val, scope.row)"
         >
         </component>
       </template>

src/views/purchase/DemandSummary/index.vue

@@ -332,7 +332,7 @@ export default {
           v-model="scope.row[scope.item.key]"
           :size="size"
           :source.sync="scope.row"
-          :disabled="!isEdit"
+          :disabled="scope.row.status !== '1' || !isEdit"
           @change="changeFinalBuyQty(scope)"
         >
         </component>
@@ -344,7 +344,7 @@ export default {
           v-model="scope.row[scope.item.key]"
           :size="size"
           :source.sync="scope.row"
-          :disabled="!isEdit"
+          :disabled="scope.row.status !== '1' ||!isEdit"
           @clear="changeBuyerName(scope)"
           @change="changeBuyerName(scope)"
         >

src/views/purchase/PurchaseDemandList/add.vue

@@ -1851,6 +1851,8 @@ export default {
         item.contactsPhone = "";
         item.address = "";
         item.statusAllot = "N";
+        item.puManagerApprover = "";
+        item.puManagerApproverName = "";
       });
       this.dafaultDate();
     },

src/views/purchase/purchase-order/add/column.js

@@ -353,7 +353,7 @@ const PurColumns = [
     rows: 1,
     inputType: "Textarea",
     isShow: true,
-    maxlength: 180,
+    maxlength: 60,
   },
   {
     key: "sysFileRecordList",
@@ -1184,7 +1184,7 @@ const CauseColumns = [
     rows: 1,
     inputType: "Textarea",
     isShow: true,
-    maxlength: 180,
+    maxlength: 60,
   },
   {
     key: "sysFileRecordList",

src/views/purchase/purchase-order/edit/index.vue

@@ -287,35 +287,38 @@ export default {
       if (prop.length === 1) {
         this.$alert("订单行不允许为空", "提示", {
           confirmButtonText: "确定",
-          callback: (action) => {
-            // this.$message({
-            //   type: 'info',
-            //   message: `action: ${ action }`
-            // });
-          },
+          callback: (action) => {},
         });
-      } else {
-        for (const key in this.params) {
-          // if (key === "puOrderItemList" || key === "puOrderExecuteList") {
-          if (key === "puOrderItemList") {
-            this.params[key].forEach((item, index) => {
-              let flag = key === "puOrderItemList" ? "rowNo" : "rowno";
+        return;
+      }
 
-              if (item[flag] && item[flag] === row[delNo]) {
-                item.id
-                  ? (item["delFlag"] = "2")
-                  : this.params[key].splice(index, 1);
-              }
-            });
+      // 编辑  非手工 数量为0  不允许删除
+      const { source } = this.params;
+      if (!this.handleIsRevise() && source != "3" && row.qty == 0) {
+        this.$notify.warning("数量为0，不可删除当前行");
+        return;
+      }
 
-            // this.params[key][index].id ?
-            //   (this.params[key][index]['delFlag'] = '2') :
-            //   this.params[key].splice(index, 1);
-          }
-        }
+      for (const key in this.params) {
+        // if (key === "puOrderItemList" || key === "puOrderExecuteList") {
+        if (key === "puOrderItemList") {
+          this.params[key].forEach((item, index) => {
+            let flag = key === "puOrderItemList" ? "rowNo" : "rowno";
 
-        await this.handleGetPrice();
+            if (item[flag] && item[flag] === row[delNo]) {
+              item.id
+                ? (item["delFlag"] = "2")
+                : this.params[key].splice(index, 1);
+            }
+          });
+
+          // this.params[key][index].id ?
+          //   (this.params[key][index]['delFlag'] = '2') :
+          //   this.params[key].splice(index, 1);
+        }
       }
+
+      await this.handleGetPrice();
     },
     // 取消
     handleCancel() {

src/views/purchase/purchase-order/print/index.vue

@@ -46,7 +46,14 @@
       <img
         :src="src"
         :alt="company"
-        style="position: absolute; top: 10px; left: 10px; z-index: 2"
+        style="
+          width: 130px;
+          height: 130px;
+          position: absolute;
+          top: 8px;
+          left: 10px;
+          z-index: 2;
+        "
       />
       <div style="position: absolute; top: 0; left: 0; z-index: 2">
         <h1>湖南德荣医疗集团 - 采购订单</h1>
@@ -57,21 +64,27 @@
         </p>
         <p style="display: flex">
           <!-- <span style="width: 50%">采购部门：{{ params.puDeptName }}</span> -->
-          <span style="width: 50%">甲方收票地址：{{ params.address }}</span>
+          <span style="width: 50%"
+            >甲方收票地址：湖南省长沙市开福区湘江北路一段91号德荣医疗物流园1栋14楼集采中心</span
+          >
           <span style="width: 25%">采购员：{{ params.buyerName }}</span>
           <!-- <span style="width: 25%">联系方式：{{ params.contactsPhone }}</span> -->
-          <span style="width: 25%">E-mail：</span>
+          <span style="width: 25%">E-mail：{{ params.buyerEmail }}</span>
         </p>
         <div style="border-bottom: 1px dashed black"></div>
         <p style="display: flex">
           <span style="width: 50%"
             >乙方（供货方）：{{ params.supplierName }}</span
           >
-          <span style="width: 25%">ATTN：</span>
-          <span style="width: 25%">E-mail：</span>
+          <span style="width: 25%"
+            >ATTN：{{ params.supplierContactsName }}</span
+          >
+          <span style="width: 25%"
+            >E-mail：{{ params.supplierContactsEmail }}</span
+          >
         </p>
         <p style="display: flex">
-          <span>甲方收货地址及联系人：</span>
+          <span>甲方收货地址及联系人：{{ params.address }}</span>
         </p>
 
         <el-table
@@ -82,9 +95,20 @@
         >
           <el-table-column prop="materialCode" label="物料编码" width="auto">
           </el-table-column>
+          <el-table-column
+            prop="materialManufacturersCode"
+            label="厂家物料编码"
+            width="auto"
+          >
+          </el-table-column>
           <el-table-column prop="materialName" label="物料名称" width="auto">
           </el-table-column>
-          <el-table-column prop="specification" label="规格" width="auto">
+          <el-table-column prop="specification" label="规格/型号" width="auto">
+            <template slot-scope="scope">
+              {{ scope.row.specification + " " + scope.row.model }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="materialRemark" label="物料备注" width="auto">
           </el-table-column>
           <el-table-column
             prop="manufacturerName"
@@ -92,9 +116,9 @@
             width="auto"
           >
           </el-table-column>
-          <el-table-column prop="unitName" label="单位" width="auto">
+          <el-table-column prop="unitName" label="单位" width="60">
           </el-table-column>
-          <el-table-column prop="qty" label="数量" width="auto">
+          <el-table-column prop="qty" label="数量" width="60">
           </el-table-column>
           <el-table-column prop="taxPrice" label="含税单价" width="auto">
           </el-table-column>
@@ -102,6 +126,11 @@
           </el-table-column>
           <el-table-column prop="registration" label="注册证号" width="auto">
           </el-table-column>
+          <el-table-column prop="deliveryDate" label="交货日期" width="auto">
+            <template slot-scope="scope">{{
+              new Date(scope.row.deliveryDate).Format("yyyy-MM-dd")
+            }}</template>
+          </el-table-column>
         </el-table>
         <p>
           二、质量要求与技术标准：符合供方企业标准、所在行业标准、国家标准。
@@ -278,6 +307,13 @@ export default {
 };
 </script>
 <style lang="scss" media="print">
+// 去除打印的页眉页脚
+@page {
+  size: auto; /* auto is the initial value */
+  margin: 3mm; /* this affects the margin in the printer settings */
+}
+// 去除打印的页眉页脚
+
 @media print {
   #PurchaseOrderPdf {
     width: 100%;

src/views/purchase/transferOrder/bipPull/index.vue

@@ -141,6 +141,7 @@ export default {
     },
   },
   created() {
+    this.params.status = '2';
     this.getList(this.params, this.Pages);
   },
   methods: {

vue.config.js

@@ -47,6 +47,7 @@ module.exports = {
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
         // target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
         //  target: `http://127.0.0.1:8000/drp-admin`,
+        // target: 'http://172.16.62.148:8000/drp-admin', //tkf本地
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",