1

src/views/purchaseIn/workbench/detail.vue

@@ -178,9 +178,7 @@
                   v-if="scope.row.bargain_status === '0'"
                   >新建信息</el-tag
                 >
-                <el-tag type="danger" :size="'mini'" v-else
-                  >待确认</el-tag
-                >
+                <el-tag type="danger" :size="'mini'" v-else>待确认</el-tag>
               </template></el-table-column
             >
 
@@ -309,6 +307,7 @@ export default {
         infoNo: "",
         bidNo: "",
         projectNo: "",
+        is_own: "1",
       },
     };
   },
@@ -419,6 +418,7 @@ export default {
     async searchList() {
       this.loading = true;
       this.parmValue.infoNo = this.queryId;
+
       const { code, data, message } = await asyncRequest.good_list(
         this.parmValue
       );

src/views/sellOut/bargainList/index.vue

@@ -210,11 +210,11 @@ export default {
       s_input: "",
       customerCode: [], //客户公司code
       options: [
-        { id: "1", label: "待主管审批" },
+        { id: "1", label: "待业务主管审批" },
         { id: "2", label: "待财务专员审批" },
         { id: "3", label: "待财务主管审批" },
         { id: "4", label: "审批通过" },
-        { id: "5", label: "主管驳回" },
+        { id: "5", label: "业务主管驳回" },
         { id: "6", label: "财务主管驳回" },
         { id: "7", label: "已取消议价" },
       ],

src/views/sellOut/sellAfterApply/components/express_feedback.vue

@@ -58,7 +58,10 @@
         <el-col :span="12">
           <el-form-item label="收件人" prop="contactor">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.contactor"
               placeholder="收件人"
             ></el-input>
@@ -67,7 +70,10 @@
         <el-col :span="12">
           <el-form-item label="收件人电话" prop="mobile">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.mobile"
               placeholder="收件人电话"
             ></el-input>
@@ -81,14 +87,20 @@
               :is-detail="true"
               :size="'mini'"
               @selectChange="addr_selectChange"
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label-width="10px" prop="addr">
             <el-input
-              :disabled="return_tag === '2'"
+              :disabled="
+                return_tag === '2' ||
+                !(status === '3' && powers.some((item) => item == '083'))
+              "
               v-model="ruleForm.addr"
               maxlength="250"
               placeholder="退回地址"
@@ -257,7 +269,7 @@ export default {
             return_wsm,
             addr,
             mobile,
-            contactor_name,
+            contactor,
             wsm_supplierNo,
             wsm_supplier,
             wsm_name,
@@ -276,18 +288,15 @@ export default {
             returnCode: returnCode || "",
             wsm_code: return_wsm ? [return_wsm] : [],
             wsm_supplierNo: wsm_supplierNo ? [wsm_supplierNo] : [],
-            contactor: contactor_name || "",
+            contactor: contactor || "",
             mobile: mobile || "",
             addr: addr || "",
             addr_code: [],
           };
-          if (addrs_code) {
-            const { provice_code, city_code, area_code } = addrs_code;
-
+          if (addr_code) {
+            let code_arr = addr_code.split(",");
             this.ruleForm.addr_code =
-              addrs_code && provice_code && city_code && area_code
-                ? [provice_code, city_code, area_code]
-                : [];
+              code_arr && code_arr.length === 3 ? code_arr : [];
           }
           this.rulesThis.wsm_supplierNo[0].required = this.return_tag === "2";
           this.rulesThis.wsm_code[0].required = this.return_tag === "2";

src/views/sellOut/sellOutOrder/detail.vue

@@ -213,6 +213,7 @@
                   />
                 </template>
               </show-data-table>
+              {{returnCode_type}}
               <show-data-table
                 :newTime="newTime"
                 v-if="

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -97,37 +97,80 @@
           >
             <el-table-column
               label="商品编码"
-              prop="good_code"
-              width="150"
+              prop="spuCode"
+              width="160"
             ></el-table-column>
-            <!-- <el-table-column
-              label="属性编码"
-              prop="good_type_code"
-              width="130"
-            ></el-table-column> -->
+
             <el-table-column
               label="商品名称"
               prop="good_name"
-              min-width="150"
-             show-overflow-tooltip
+              min-width="120"
+              show-overflow-tooltip
             ></el-table-column>
-            <!-- <el-table-column
-              label="商品属性"
+            <el-table-column
+              label="规格"
               prop="attribute"
+              show-overflow-tooltip
               min-width="120"
-            ></el-table-column> -->
+            >
+              <template slot-scope="scope">
+                <span
+                  v-for="(si, sii) in scope.row.specinfo"
+                  :key="sii + si.spec_value_id"
+                  >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{
+                    si.spec_value
+                  }}]</span
+                >
+              </template>
+            </el-table-column>
+            <el-table-column label="分类" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span
+                  v-for="(si, sii) in scope.row.can"
+                  :key="sii + si.spec_value_id"
+                  >{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
+                >
+              </template></el-table-column
+            >
             <el-table-column
-              label="分类"
-              prop="sort_f"
+              label="品牌"
+              prop="brand_name"
+              show-overflow-tooltip
               width="100"
             ></el-table-column>
+            <el-table-column
+              label="单位"
+              prop="unit"
+              show-overflow-tooltip
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="当前库存"
+              show-overflow-tooltip
+              prop="total_stock"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="待入库存"
+              show-overflow-tooltip
+              prop="wait_in_stock"
+              width="80"
+            ></el-table-column>
+            <el-table-column
+              label="待出库存"
+              show-overflow-tooltip
+              prop="wait_out_stock"
+              width="80"
+            ></el-table-column>
             <el-table-column
               label="可用库存"
+              show-overflow-tooltip
               prop="usable_stock"
               width="80"
             ></el-table-column>
             <el-table-column
               label="在途库存"
+              show-overflow-tooltip
               prop="intra_stock"
               width="80"
             ></el-table-column>

src/views/stock/stockCount/components/spaceCount/columns.js

@@ -1,46 +1,90 @@
 export default [
-     {
-          prop: "supplier_code",
-          label: "供应商编码",
-          width: "140",
-        },
-        {
-          prop: "wsm_code",
-          label: "仓库编码",
-          width: "170",
-        },
-        {
-          prop: "supplier_wsm_name",
-          label: "仓库名称",
-          "min-width": "220",
-        },
-        
-        // {
-        //   prop: "wsm_name",
-        //   label: "仓库名称",
-        // },
-        // {
-        //   prop: "good_code",
-        //   label: "商品编码",
-        //   width: "150",
-        // },
-        // {
-        //   prop: "type_code",
-        //   label: "商品属性编码",
-        //   width: "130",
-        // },
-        {
-          prop: "good_name",
-          label: "商品名称",
-          "min-width": "150",
-        },
-       
-        {
-          prop: "in_total",
-          label: "入库量",
-        },
-        {
-          prop: "out_total",
-          label: "出库量",
-        },
+  {
+    prop: "company_no",
+    label: "仓库业务公司编码",
+    width: "150",
+  },
+  {
+    prop: "company_name",
+    label: "仓库业务公司名称",
+    'min-width': "180"
+  },
+  {
+    prop: "supplier_code",
+    label: "仓库所在公司编码",
+    width: "150",
+  },
+  {
+    prop: "supplier_name",
+    label: "仓库所在公司名称",
+    'min-width': "180"
+  },
+  {
+    prop: "wsm_code",
+    label: "仓库编码",
+    width: '180'
+  },
+  {
+    prop: "wsm_name",
+    label: "仓库名称",
+    'min-width': "100"
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "160",
+  },
+  // {
+  //   prop: "type_code",
+  //   label: "属性编码",
+  //   width: "150",
+  // },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "150",
+  },
+  {
+    prop: "specinfo",
+    label: "规格",
+    "min-width": "150",
+    _slot_: 'specinfo'
+  },
+  {
+    prop: "can",
+    label: "分类",
+    _slot_: 'can',
+    width: "155",
+  },
+  {
+    prop: "brand_name",
+    label: "分类",
+    width: "85",
+  },
+
+  {
+    prop: "unit",
+    label: "单位",
+    width: "50",
+  },
+  {
+    prop: "usable_stock",
+    label: "当前库存",
+    width: "80",
+  },
+  {
+    prop: "wait_in_stock",
+    label: "待入库",
+    width: "80",
+  },
+  {
+    prop: "wait_out_stock",
+    label: "待出库",
+    width: "80",
+  },
+  {
+    prop: "intra_stock",
+    label: "在途库存",
+    width: "80",
+  },
 ]

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -26,16 +26,17 @@
         <template #table-header="{}">
           <div style="width: 100%" class="min">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 0">
-                <period-date-picker
-                  :start="parmValue.start"
-                  :end="parmValue.end"
-                  :width="'135px'"
+              <el-col :span="12" style="width: 300px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :names="''"
                   :size="searchSize"
-                  @timeReturned="handleTime"
+                  :is-detail="id !== 'add'"
+                  :placeholder="'业务公司'"
+                  @searchChange="supplierChange"
                 />
               </el-col>
-              <el-col :span="10" style="width: 290px">
+              <el-col :span="10" style="width: 330px; padding: 0 0 0 10px">
                 <el-input
                   v-model="parmValue.type_code"
                   :size="searchSize"
@@ -43,16 +44,6 @@
                 />
               </el-col>
 
-              <!-- 刷新 -->
-              <el-col :span="4" style="width: 66px" class="fr">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  label=""
-                  @click="searchList"
-                  >刷新</el-button
-                >
-              </el-col>
               <!-- 重置 -->
               <el-col :span="4" style="width: 66px" class="fr">
                 <el-button
@@ -65,17 +56,7 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <el-col :span="12" style="width: 280px">
-                <search-work-company
-                  :value="parmValue.companyNo"
-                  :names="''"
-                  :size="searchSize"
-                  :is-detail="id !== 'add'"
-                  :placeholder="'业务公司'"
-                  @searchChange="supplierChange"
-                />
-              </el-col>
-              <el-col :span="12" style="width: 310px; padding: 0 0 0 10px">
+              <el-col :span="12" style="width: 380px">
                 <search-supplier
                   :size="searchSize"
                   :placeholder="'供应商公司'"
@@ -84,7 +65,7 @@
                   @searchChange="selectSupplier"
                 />
               </el-col>
-              <el-col :span="12" style="width: 310px; padding-left: 10px">
+              <el-col :span="12" style="width: 330px; padding:0 0 0 10px">
                 <search-stock
                   :isDetail="true"
                   :size="searchSize"
@@ -97,18 +78,32 @@
                   @searchChange="selectStock"
                 />
               </el-col>
+              <!-- 刷新 -->
+              <el-col :span="4" style="width: 66px" class="fr">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  label=""
+                  @click="searchList"
+                  >刷新</el-button
+                >
+              </el-col>
             </el-row>
           </div>
         </template>
-        <template #status="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
-            "
-          ></el-tag>
+        <template #specinfo="{ scope }">
+          <span
+            v-for="(si, sii) in scope.row.specinfo"
+            :key="sii + si.spec_value_id"
+            >{{ sii === 0 ? "" : "-" }}{{ si.spec_name }}[{{
+              si.spec_value
+            }}]</span
+          >
+        </template>
+        <template #can="{ scope }">
+          <span v-for="(si, sii) in scope.row.cat_info" :key="sii + si.id"
+            >{{ sii === 0 ? "" : "-" }}{{ si.name }}</span
+          >
         </template>
       </ex-table>
     </div>

src/views/stock/stockCount/index.vue

@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      activeName: "productWeido", //默认选中的区间统计选项
+      activeName: "count", //默认选中的区间统计选项
     };
   },
   methods: {},