build

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

@@ -22,18 +22,17 @@
       :label="item.name"
       :value="item.code + ''"
       :disabled="item.status + '' !== '1'"
-    >
-    </el-option>
+    />
   </el-select>
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/search-supplier";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/components/search-supplier'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "SearchSupplier",
+  name: 'SearchSupplier',
   mixins: [resToken],
-  props: ["size", "value", "placeholder", "isDetail", "disabled", "names", "type", "isp"],
+  props: ['size', 'value', 'placeholder', 'isDetail', 'disabled', 'names', 'type', 'isp'],
   /**
    * 属性集合
    * @param {String}        size             : 组件大小            非必填
@@ -52,86 +51,86 @@ export default {
     return {
       options: [],
       selectLoading: false,
-      searchName: "",
-    };
+      searchName: ''
+    }
   },
   watch: {
-    names: function (val, old) {
+    names: function(val, old) {
       // console.log(val, old, this.isDetail, "1");
-      this.searchName = val;
+      this.searchName = val
       if (this.isDetail && this.searchName) {
-        this.remoteMethod(this.searchName, this.isp);
+        this.remoteMethod(this.searchName, this.isp)
       }
     },
-    isDetail: function (val, old) {
+    isDetail: function(val, old) {
       // console.log(val, old, this.isDetail, "2");
       if (val && this.searchName) {
-        this.remoteMethod(this.searchName, this.isp);
+        this.remoteMethod(this.searchName, this.isp)
       }
-    },
+    }
   },
   mounted() {
-    this.options = [];
-    this.selectLoading = false;
+    this.options = []
+    this.selectLoading = false
   },
   methods: {
     async selectChange(e) {
       // console.log(e);
       // console.log("1111" + this.isp);
       if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.code === e[0]);
+        const index = this.options.findIndex((v) => v.code === e[0])
         if (index !== -1) {
-          let model = {
+          const model = {
             id: this.options[index].id,
             code: this.options[index].code,
             label: this.options[index].name,
-            isPower: this.options[index].has_account + "" !== "0",
-          };
-          this.$emit("searchChange", model);
+            isPower: this.options[index].has_account + '' !== '0'
+          }
+          this.$emit('searchChange', model)
         } else {
-          this.$emit("searchChange", {});
+          this.$emit('searchChange', {})
         }
       } else {
-        this.$emit("searchChange", {});
+        this.$emit('searchChange', {})
       }
     },
     async remoteMethod(query, types) {
-      this.selectLoading = true;
-      if (query !== "") {
-        this.options = [];
-        let formValue = {
+      this.selectLoading = true
+      if (query !== '') {
+        this.options = []
+        const formValue = {
           page: 1,
           size: 100,
           name: query,
-          code: "",
-          is_platform: this.type ? this.type : "",
-        };
-        const { code, data, message } = await asyncRequest.list(formValue);
+          code: '',
+          is_platform: this.type ? this.type : ''
+        }
+        const { code, data, message } = await asyncRequest.list(formValue)
         if (code === 0) {
-          const { list } = data;
-          this.options = list;
+          const { list } = data
+          this.options = list
           if (types) {
             // console.log(this.value);
-            const index = this.options.findIndex((v) => v.code + '' === this.value[0] + '');
+            const index = this.options.findIndex((v) => v.code + '' === this.value[0] + '')
             // console.log(this.options);
             // console.log(index);
             if (index !== -1) {
-              await this.selectChange([this.options[index].code]);
+              await this.selectChange([this.options[index].code])
             }
           }
           // console.log(types);
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       } else {
-        this.options = [];
+        this.options = []
       }
-      this.selectLoading = false;
-    },
-  },
-};
+      this.selectLoading = false
+    }
+  }
+}
 </script>
 
 <style></style>

src/layout/components/Navbar.vue

@@ -12,20 +12,23 @@
     </div>
 
     <div class="right-menu">
-      <el-tooltip placement="left" content="登录采销结算平台">
-        <el-button
-          size="large"
-          style="position:fixed; bottom: 100px; right: 60px"
-          circle
-          icon="el-icon-s-promotion"
-          @click="openSettlementSystem"
-        />
-      </el-tooltip>
 
       <div class="right-menu-item">
         <company-select ref="companySelect" select-all global placeholder="请选择供应商" />
       </div>
 
+      <div class="right-menu-item">
+        <el-tooltip placement="left" content="登录采销结算平台">
+          <el-button
+            size="large"
+            style="position:fixed; bottom: 100px; right: 60px"
+            circle
+            icon="el-icon-s-promotion"
+            @click="openSettlementSystem"
+          />
+        </el-tooltip>
+      </div>
+
       <template v-if="device !== 'mobile'">
         <i
           v-if="isShow"

src/views/goodStore/goodsCost/index.vue

@@ -248,12 +248,13 @@
           ></i>
         </el-tooltip>
 
+        <!-- scope.row.has_account + '' == '0' && -->
         <el-tooltip
           v-if="
             ((ppowers.some((i) => i == '7') && scope.row.status + '' === '7') ||
               (ppowers.some((i) => i == '6') && scope.row.status + '' === '6') ||
               (ppowers.some((i) => i == '8') && scope.row.status + '' === '8')) &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
+            (( scope.row.is_stock + '' === '0') ||
               scope.row.is_stock + '' === '1')
           "
           effect="dark"

src/views/goodStore/supplierGoodsCost/index.vue

@@ -258,14 +258,12 @@
             @click="showDonlineDlg(scope.row.spuCode)"
           ></i>
         </el-tooltip> -->
-
+        <!-- (scope.row.is_stock + '' === '0') -->
         <el-tooltip
           v-if="
             ((ppowers.some((i) => i == '7') && scope.row.status + '' === '7') ||
               (ppowers.some((i) => i == '6') && scope.row.status + '' === '6') ||
-              (ppowers.some((i) => i == '8') && scope.row.status + '' === '8')) &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
-              scope.row.is_stock + '' === '1')
+              (ppowers.some((i) => i == '8') && scope.row.status + '' === '8'))
           "
           effect="dark"
           content="修改"
@@ -281,12 +279,13 @@
             "
           ></i>
         </el-tooltip>
+        <!-- &&
+            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
+              scope.row.is_stock + '' === '1') -->
         <el-tooltip
           v-if="
             ppowers.some((i) => i == '4') &&
-            (scope.row.status + '' === '4' || scope.row.status + '' === '1') &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
-              scope.row.is_stock + '' === '1')
+            (scope.row.status + '' === '4' || scope.row.status + '' === '1')
           "
           effect="dark"
           content="修改基础信息"
@@ -297,12 +296,13 @@
             @click="wantto(scope.row.is_online, scope.row.spuCode, scope.row.status, '2')"
           ></i>
         </el-tooltip>
+        <!-- &&
+            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
+              scope.row.is_stock + '' === '1') -->
         <el-tooltip
           v-if="
             ppowers.some((i) => i == '5') &&
-            (scope.row.status + '' === '5' || scope.row.status + '' === '1') &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
-              scope.row.is_stock + '' === '1')
+            (scope.row.status + '' === '5' || scope.row.status + '' === '1')
           "
           effect="dark"
           content="修改成本信息"

src/views/purchaseIn/purchaseOrder/components/order-in-table.vue

@@ -22,6 +22,7 @@
 
           <el-table-column fixed="right" width="50">
             <template slot="header" slot-scope="scope">
+              <!-- sitem.has_account + '' === '0' && -->
               <el-tooltip
                 class="fr"
                 style="margin: 3px 0 0 0"
@@ -29,7 +30,7 @@
                   ((status + '' === '1' && powers.some((i) => i == '028')) ||
                     (status + '' === '2' && powers.some((i) => i == '028'))) &&
                   sitem &&
-                  ((sitem.has_account + '' === '0' &&
+                  ((
                     (sitem.order_type + '' === '2' ||
                       sitem.order_type + '' === '3' ||
                       sitem.order_type + '' === '4')) ||

src/views/purchaseIn/purchaseOrder/index.vue

@@ -491,20 +491,20 @@ export default {
         this.$message.warning("只能选择待与供应商确认的采购单！");
         return;
       }
-      if (iss) {
-        let htmlList = "<ul>";
-        errorList.forEach((v) => {
-          console.log(v);
-          htmlList += `<li>${v}</li>`;
-        });
-        htmlList += "</ul>";
-        this.$notify({
-          title: "以下采购单对应的供应商账号已开启，不允许在本系统操作！",
-          dangerouslyUseHTMLString: true,
-          message: htmlList,
-        });
-        return;
-      }
+      // if (iss) {
+      //   let htmlList = "<ul>";
+      //   errorList.forEach((v) => {
+      //     console.log(v);
+      //     htmlList += `<li>${v}</li>`;
+      //   });
+      //   htmlList += "</ul>";
+      //   this.$notify({
+      //     title: "以下采购单对应的供应商账号已开启，不允许在本系统操作！",
+      //     dangerouslyUseHTMLString: true,
+      //     message: htmlList,
+      //   });
+      //   return;
+      // }
       await this.$confirm(`确定批量确认？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/sellOut/sellOutOrder/detail.vue

@@ -120,6 +120,7 @@
               />
             </el-collapse-item>
             <!-- @todo: 库存品只能由角色库管和库管-张凯旋操作；非库存品和采返商品 只能有当前供应商负责人操作  -->
+            <!-- sitem.has_account + '' === '0' && -->
             <el-collapse-item
               title="库管发货"
               name="3"
@@ -128,7 +129,7 @@
                 ppowers.some((i) => i == '1') &&
                 sitem &&
                 (sitem.order_type + '' === '1' ||
-                  (sitem.has_account + '' === '0' &&
+                  (
                     (sitem.order_type + '' === '2' ||
                       sitem.order_type + '' === '3' ||
                       sitem.order_type + '' === '4')))

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -242,9 +242,9 @@
                 <template slot="is_receive">
                   <el-tag :size="'mini'" :type="''">{{
                     resitem.is_receive + '' === "1"
-                      ? "已收到货"
+                      ? "销售订单退货，采购订单也退货"
                       : resitem.is_receive + '' === "0"
-                      ? "未收到"
+                      ? "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>