snow пре 1 година
родитељ
комит
d347aaba94

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/0.js


+ 3 - 2
src/views/goodStore/goodsCost/index.vue

@@ -321,11 +321,12 @@
         <!-- scope.row.has_account + '' == '0' && -->
         <el-tooltip
           v-if="
-            (((ppowers.some((i) => i == '7') && scope.row.status + '' === '7') ||
+            ((((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.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
-            !isSupertube && String(scope.row.has_account) === '0'
+            !isSupertube && String(scope.row.has_account) === '0')
+             && String(scope.row.createrid) !== '0'
           "
           effect="dark"
           content="修改"

+ 4 - 4
src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -6,15 +6,15 @@
       </el-select>
     </el-form-item>
     <el-form-item label="审核备注" prop="remark">
-      <el-input v-model="formData.remark" type="textarea" />
+      <el-input v-model="formData.remark" placeholder="审核备注" type="textarea" />
     </el-form-item>
 
     <template v-if="displayExpressField">
       <el-form-item label="收货人" prop="contactor">
-        <el-input v-model="formData.contactor" />
+        <el-input v-model="formData.contactor" placeholder="收货人" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" :maxlength="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" placeholder="联系电话" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <search-area
@@ -22,7 +22,7 @@
           :is-detail="true"
           size="mini"
           :names="label"
-          placeholder="退货地址"
+          placeholder="退货地址省市区"
           :level="3"
           @searchChange="areaChange($event)"
         />

+ 1 - 1
src/views/sellOut/sellAfterApply/detail.vue

@@ -223,11 +223,11 @@
 
             <el-collapse-item
               name="7"
-              title="业务公司修改,待供应商确认"
               v-if="
                 isHasPermission({ status: '10', process: '10' }) &&
                 String(sitem.has_account) === '0'
               "
+              title="业务公司修改,待供应商确认"
             >
               <supplier-confrim :sitem="sitem" @changeStatus="handleSupplierConfirm" />
             </el-collapse-item>

+ 1 - 0
src/views/sellOut/sellAfterApply/index.vue

@@ -326,6 +326,7 @@
     </div>
   </div>
 </template>
+
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

+ 4 - 4
src/views/supplierSellOut/supplierSellAfterApply/components/supplier-confirm.vue

@@ -6,15 +6,15 @@
       </el-select>
     </el-form-item>
     <el-form-item label="审核备注" prop="remark">
-      <el-input v-model="formData.remark" type="textarea" />
+      <el-input v-model="formData.remark" type="textarea" placeholder="审核备注" />
     </el-form-item>
 
     <template v-if="displayExpressField">
       <el-form-item label="收货人" prop="contactor">
-        <el-input v-model="formData.contactor" />
+        <el-input v-model="formData.contactor" placeholder="收货人" />
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile">
-        <el-input v-model="formData.mobile" :maxlength="11" />
+        <el-input v-model="formData.mobile" :maxlength="11" placeholder="联系电话" />
       </el-form-item>
       <el-form-item label="退货地址" prop="addr_code">
         <search-area
@@ -22,7 +22,7 @@
           :is-detail="true"
           size="mini"
           :names="label"
-          placeholder="退货地址"
+          placeholder="退货地址省市区"
           :level="3"
           @searchChange="areaChange($event)"
         />

Неке датотеке нису приказане због велике количине промена